archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 44086,44126: [Backport #9221]

Browse source 
* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-12-20 18:48:49 +00:00
parent 11fe8c9715
commit ef61d714f3
4 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
Sat Dec 21 03:46:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@ruby-lang.org>
* 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@ruby-lang.org>
* enumerator.c (enumerator_with_index): try to convert given offset to

4
ext/date/date_parse.c
View file

@ -765,9 +765,9 @@ parse_time(VALUE str, VALUE hash)
"("
"(?: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;

4
ext/date/date_strptime.c
View file

@ -567,8 +567,8 @@ date__strptime_internal(const char *str, size_t slen,
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;

6
version.h
View file

@ -1,10 +1,10 @@
#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"