From 0eea3ea7e028144caa81a4795b68868a729888ea Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Sun, 10 Jul 2005 17:56:16 +0000 Subject: * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): mistook in merging the patch of [ruby-dev:26235] at revision 1.4.2.6. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/webrick/cgi.rb | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87490a409..87c9fa182 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 11 02:53:00 2005 GOTOU Yuuzou + + * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): + mistook in merging the patch of [ruby-dev:26235] at + revision 1.4.2.6. + Sun Jul 10 23:58:04 2005 Tanaka Akira * lib/pathname.rb (Pathname#unlink): try Dir.unlink first to diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb index 5104715b2..29fa67d18 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? -- cgit