From e3fa33da383638bbe69f5581060dcae18a1dc9f5 Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jul 2005 17:54:58 +0000
Subject: [PATCH] * 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@8744 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 b85c2508d6..56f13b1138 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 11 02:50:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): 
+	  mistook to merge the patch of [ruby-dev:26235] at
+	  revision 1.11.
+
 Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pathname.rb (Pathname#unlink): try Dir.unlink first to
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index 21ffb7b89e..ae77e1759d 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?