diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-04 05:21:05 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-04 05:21:05 +0000 |
commit | 8baf1746a4b399e784ad0a2b54bf522762a7189e (patch) | |
tree | 174d7fb3db448bd4dffc86d7b0aa0667e958f46f | |
parent | 9cb20d6449f9e2e7106b5fb319026aa731041174 (diff) |
merge revision(s) 18220:
* lib/webrick/httputils.rb (WEBrick::HTTPUtils#split_header_value):
reduce backtrack. based on a fix by Christian Neukirchen
<chneukirchen AT gmail.com>.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/webrick/httputils.rb | 16 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 5 insertions, 13 deletions
diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb index c57af2c860..976d3e915e 100644 --- a/lib/webrick/httputils.rb +++ b/lib/webrick/httputils.rb @@ -23,16 +23,8 @@ module WEBrick ret = path.dup ret.gsub!(%r{/+}o, '/') # // => / - while ret.sub!(%r{/\.(/|\Z)}o, '/'); end # /. => / - begin # /foo/.. => /foo - match = ret.sub!(%r{/([^/]+)/\.\.(/|\Z)}o){ - if $1 == ".." - raise "abnormal path `#{path}'" - else - "/" - end - } - end while match + while ret.sub!(%r'/\.(?:/|\Z)', '/'); end # /. => / + while ret.sub!(%r'/(?!\.\./)[^/]+/\.\.(?:/|\Z)', '/'); end # /foo/.. => /foo raise "abnormal path `#{path}'" if %r{/\.\.(/|\Z)} =~ ret ret @@ -154,8 +146,8 @@ module WEBrick module_function :parse_header def split_header_value(str) - str.scan(/((?:"(?:\\.|[^"])+?"|[^",]+)+) - (?:,\s*|\Z)/xn).collect{|v| v[0] } + str.scan(%r'\G((?:"(?:\\.|[^"])+?"|[^",]+)+) + (?:,\s*|\Z)'xn).flatten end module_function :split_header_value @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-08-04" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080804 -#define RUBY_PATCHLEVEL 68 +#define RUBY_PATCHLEVEL 69 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |