diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-25 14:35:21 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-25 14:35:21 +0000 |
commit | 1181a092af921b79d952c5d6dc735bc41203a351 (patch) | |
tree | cf511b2a7b2b35598ad2c028e1be724f11133b15 | |
parent | 65aa393ae7e3b81174398746d8aacd20bb662c36 (diff) | |
download | ruby-1181a092af921b79d952c5d6dc735bc41203a351.tar.gz |
* 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/trunk@18220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/webrick/httputils.rb | 16 |
2 files changed, 10 insertions, 12 deletions
@@ -1,3 +1,9 @@ +Fri Jul 25 23:35:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/webrick/httputils.rb (WEBrick::HTTPUtils#split_header_value): + reduce backtrack. based on a fix by Christian Neukirchen + <chneukirchen AT gmail.com>. + Fri Jul 25 21:55:38 2008 Yusuke Endoh <mame@tsg.ne.jp> * test/ruby/enc/test_koi8.rb: move from test/ruby/test_koi8.rb. diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb index b9bd5ae91d..f921364786 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 @@ -155,8 +147,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 |