diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-10 17:56:16 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-10 17:56:16 +0000 |
| commit | 0eea3ea7e028144caa81a4795b68868a729888ea (patch) | |
| tree | 125a7adef515e7d07eb89d16871a4398ec119d3a | |
| parent | 7312ba0819fa0f0fc4df76a314b5eb42d3789dc0 (diff) | |
| download | ruby-0eea3ea7e028144caa81a4795b68868a729888ea.tar.gz ruby-0eea3ea7e028144caa81a4795b68868a729888ea.tar.xz ruby-0eea3ea7e028144caa81a4795b68868a729888ea.zip | |
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/webrick/cgi.rb | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -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 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? |