nagachika	2013-12-21 03:48:49 +0900 (Sat, 21 Dec 2013)

  New Revision: 44306

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

  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_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/date/date_parse.c
    branches/ruby_2_0_0/ext/date/date_strptime.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 44305)
+++ ruby_2_0_0/ChangeLog	(revision 44306)
@@ -1,3 +1,16 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Dec 21 03:46:14 2013  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]
+
+Sat Dec 21 03:46:14 2013  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]
+
 Fri Dec 13 00:23:01 2013  NARUSE, Yui  <naruse@r...>
 
 	* enumerator.c (enumerator_with_index): try to convert given offset to
Index: ruby_2_0_0/ext/date/date_strptime.c
===================================================================
--- ruby_2_0_0/ext/date/date_strptime.c	(revision 44305)
+++ ruby_2_0_0/ext/date/date_strptime.c	(revision 44306)
@@ -567,8 +567,8 @@ date__strptime_internal(const char *str, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/date/date_strptime.c#L567
 		    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_2_0_0/ext/date/date_parse.c
===================================================================
--- ruby_2_0_0/ext/date/date_parse.c	(revision 44305)
+++ ruby_2_0_0/ext/date/date_parse.c	(revision 44306)
@@ -765,9 +765,9 @@ parse_time(VALUE str, VALUE hash) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/date/date_parse.c#L765
 		   "("
 		     "(?: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_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 44305)
+++ ruby_2_0_0/version.h	(revision 44306)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-12-14"
-#define RUBY_PATCHLEVEL 359
+#define RUBY_RELEASE_DATE "2013-12-21"
+#define RUBY_PATCHLEVEL 360
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 

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


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