summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-10 08:36:00 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-10 08:36:00 +0000
commit640dc5b9972bce501bc541252ef8817b843b48fb (patch)
tree8bf9adc3ee1da68706cf0be4c3d4abaa4773e974 /lib
parent7d6bea2fea03032f7196ddd6b9188dfe5ad8fa4a (diff)
merge revision(s) 28945:
* lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri): rollup leading slashes. [ruby-core:31657] patched by Jamison Wilde NOTE: //authority/path is valid relative URI both RFC2396 and RFC3986. So when give a relative URI-like string to URI lib, users must care leading slashes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/webrick/httprequest.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb
index 0547a3acd6..ff801fd04b 100644
--- a/lib/webrick/httprequest.rb
+++ b/lib/webrick/httprequest.rb
@@ -249,6 +249,7 @@ module WEBrick
if @config[:Escape8bitURI]
str = HTTPUtils::escape8bit(str)
end
+ str.sub!(%r{\A/+}o, '/')
uri = URI::parse(str)
return uri if uri.absolute?
if self["host"]