From 322610cb37327860396979507c54bb4964fc237f Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 29 Jan 2014 05:45:27 +0000 Subject: 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/date/date_parse.c | 4 ++-- ext/date/date_strptime.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ext') diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c index 7c8267bbab..0ce0663804 100644 --- a/ext/date/date_parse.c +++ b/ext/date/date_parse.c @@ -701,9 +701,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; diff --git a/ext/date/date_strptime.c b/ext/date/date_strptime.c index eaec8e716b..f1196bc0bd 100644 --- a/ext/date/date_strptime.c +++ b/ext/date/date_strptime.c @@ -566,8 +566,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; -- cgit v1.2.3