diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-27 17:16:06 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-27 17:16:06 +0000 |
commit | 63c32170e7a937b4afd306012a057a8911bf24cc (patch) | |
tree | 7c2759817776f5ff737b2acccacbf3f128ab5529 /test | |
parent | 4eae21a92dfdfa010b8f91c7a7b11cf3e9215e2f (diff) |
* 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
Diffstat (limited to 'test')
-rw-r--r-- | test/webrick/test_cgi.rb | 7 | ||||
-rw-r--r-- | test/webrick/webrick.cgi | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb index 60d5da6a72..082fe0f190 100644 --- a/test/webrick/test_cgi.rb +++ b/test/webrick/test_cgi.rb @@ -16,6 +16,7 @@ class TestWEBrickCGI < Test::Unit::TestCase config = { :CGIInterpreter => EnvUtil.rubybin, :DocumentRoot => File.dirname(__FILE__), + :DirectoryIndex => ["webrick.cgi"], } TestWEBrick.start_httpserver(config){|server, addr, port| http = Net::HTTP.new(addr, port) @@ -41,6 +42,12 @@ class TestWEBrickCGI < Test::Unit::TestCase req["Content-Type"] = "application/x-www-form-urlencoded" http.request(req, "a=1&a=2&b=x"){|res| assert_equal("a=1, a=2, b=x", res.body)} + req = Net::HTTP::Get.new("/") + http.request(req){|res| + ary = res.body.to_a + assert_match(%r{/$}, ary[0]) + assert_match(%r{/webrick.cgi$}, ary[1]) + } } end end diff --git a/test/webrick/webrick.cgi b/test/webrick/webrick.cgi index ac525fb07d..9edbb13847 100644 --- a/test/webrick/webrick.cgi +++ b/test/webrick/webrick.cgi @@ -12,6 +12,10 @@ class TestApp < WEBrick::CGI "#{key}=#{v}" }.join(", ") }.join(", ") + elsif %r{/$} =~ req.request_uri.to_s + res.body = "" + res.body << req.request_uri.to_s << "\n" + res.body << req.script_name else res.body = req.script_name end |