summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-10 17:56:16 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-07-10 17:56:16 +0000
commit94763801f3387d627ab836de2b0328a9cfc61a53 (patch)
tree125a7adef515e7d07eb89d16871a4398ec119d3a
parentb5c68b60bd408a4e14cd58ac0410b0a7444610c2 (diff)
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/webrick/cgi.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 87490a4..87c9fa1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 11 02:53:00 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * 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 <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 5104715..29fa67d1 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?