usa	2014-01-29 14:45:27 +0900 (Wed, 29 Jan 2014)

  New Revision: 44746

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44746

  Log:
    merge revision(s) 44086,44126: [Backport #9221]
    
    * ext/date/date_parse.c (parse_time): unset case-insensitive flag
      for [:alpha:], which already implies both cases, to get rid of
      backtrack explosion.  [ruby-core:58876] [Bug #9221]
    
    * ext/date/date_strptime.c (date__strptime_internal): unset
      case-insensitive flag for [:alpha:], which already implies both
      cases, to get rid of backtrack explosion.  [ruby-core:58984]
      [Bug #9221]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/date/date_parse.c
    branches/ruby_1_9_3/ext/date/date_strptime.c
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 44745)
+++ ruby_1_9_3/ChangeLog	(revision 44746)
@@ -1,3 +1,16 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Wed Jan 29 14:44:44 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/date/date_strptime.c (date__strptime_internal): unset
+	  case-insensitive flag for [:alpha:], which already implies both
+	  cases, to get rid of backtrack explosion.  [ruby-core:58984]
+	  [Bug #9221]
+
+Wed Jan 29 14:44:44 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/date/date_parse.c (parse_time): unset case-insensitive flag
+	  for [:alpha:], which already implies both cases, to get rid of
+	  backtrack explosion.  [ruby-core:58876] [Bug #9221]
+
 Wed Jan 29 14:26:10 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* enumerator.c (enumerator_with_index): should not store local variable
Index: ruby_1_9_3/ext/date/date_strptime.c
===================================================================
--- ruby_1_9_3/ext/date/date_strptime.c	(revision 44745)
+++ ruby_1_9_3/ext/date/date_strptime.c	(revision 44746)
@@ -566,8 +566,8 @@ date__strptime_internal(const char *str, https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/date/date_strptime.c#L566
 		    static const char pat_source[] =
 			"\\A("
 			"(?:gmt|utc?)?[-+]\\d+(?:[,.:]\\d+(?::\\d+)?)?"
-			"|[[:alpha:].\\s]+(?:standard|daylight)\\s+time\\b"
-			"|[[:alpha:]]+(?:\\s+dst)?\\b"
+			"|(?-i:[[:alpha:].\\s]+)(?:standard|daylight)\\s+time\\b"
+			"|(?-i:[[:alpha:]]+)(?:\\s+dst)?\\b"
 			")";
 		    static VALUE pat = Qnil;
 		    VALUE m, b;
Index: ruby_1_9_3/ext/date/date_parse.c
===================================================================
--- ruby_1_9_3/ext/date/date_parse.c	(revision 44745)
+++ ruby_1_9_3/ext/date/date_parse.c	(revision 44746)
@@ -701,9 +701,9 @@ parse_time(VALUE str, VALUE hash) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/date/date_parse.c#L701
 		   "("
 		     "(?:gmt|utc?)?[-+]\\d+(?:[,.:]\\d+(?::\\d+)?)?"
 		   "|"
-		     "[[:alpha:].\\s]+(?:standard|daylight)\\stime\\b"
+		     "(?-i:[[:alpha:].\\s]+)(?:standard|daylight)\\stime\\b"
 		   "|"
-		     "[[:alpha:]]+(?:\\sdst)?\\b"
+		     "(?-i:[[:alpha:]]+)(?:\\sdst)?\\b"
 		   ")"
 		")?";
     static VALUE pat = Qnil;
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 44745)
+++ ruby_1_9_3/version.h	(revision 44746)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 500
+#define RUBY_PATCHLEVEL 501
 
 #define RUBY_RELEASE_DATE "2014-01-29"
 #define RUBY_RELEASE_YEAR 2014

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44086,44126


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/