From 63c32170e7a937b4afd306012a057a8911bf24cc Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Fri, 27 May 2005 17:16:06 +0000 Subject: * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): ENV["REQUEST_URI"] is better to get correct Request-URI than ENV["SCRIPT_NAME"] + ENV["PATH_INFO"]. [ruby-dev:26235] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/webrick/cgi.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/webrick') diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb index e795a8b4e2..5104715b2d 100644 --- a/lib/webrick/cgi.rb +++ b/lib/webrick/cgi.rb @@ -150,15 +150,17 @@ module WEBrick meth = @env["REQUEST_METHOD"] || "GET" 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? - url << "?" << query_string + unless url = @env["REQUEST_URI"] + url = WEBrick::HTTPUtils.escape_path(url) + if query_string = @env["QUERY_STRING"] + unless query_string.empty? + url << "?" << query_string + end end end # we cannot get real HTTP version of client ;) httpv = @config[:HTTPVersion] - "#{meth} #{url} HTTP/#{httpv}" + return "#{meth} #{url} HTTP/#{httpv}" end def setup_header -- cgit v1.2.3