diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-10 17:54:58 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-10 17:54:58 +0000 |
commit | 16f9d2084523b4c382745b4db3ed80383c4d2c30 (patch) | |
tree | cd730ab1ef325808734c3726699bb37786a1050d /lib/webrick/cgi.rb | |
parent | 95dd3615b3c799c1b8a3d300a3ee52b7150f9ffe (diff) | |
download | ruby-16f9d2084523b4c382745b4db3ed80383c4d2c30.tar.gz ruby-16f9d2084523b4c382745b4db3ed80383c4d2c30.tar.xz ruby-16f9d2084523b4c382745b4db3ed80383c4d2c30.zip |
* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
mistook to merge the patch of [ruby-dev:26235] at
revision 1.11.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick/cgi.rb')
-rw-r--r-- | lib/webrick/cgi.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb index 21ffb7b89..ae77e1759 100644 --- a/lib/webrick/cgi.rb +++ b/lib/webrick/cgi.rb @@ -148,9 +148,9 @@ module WEBrick def request_line meth = @env["REQUEST_METHOD"] || "GET" - url = (@env["SCRIPT_NAME"] || File.expand_path($0)).dup - url << @env["PATH_INFO"].to_s unless url = @env["REQUEST_URI"] + url = (@env["SCRIPT_NAME"] || File.expand_path($0)).dup + url << @env["PATH_INFO"].to_s url = WEBrick::HTTPUtils.escape_path(url) if query_string = @env["QUERY_STRING"] unless query_string.empty? |