diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-29 22:10:56 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-29 22:10:56 +0000 |
| commit | 6d69a240b86c10f128347a681c731c5cda972e22 (patch) | |
| tree | 8c9bd04a6a25651179305f2e8e60de5f920e4771 /test | |
| parent | 0e3af10d5ef375f69ba8792fa5355e635b54421b (diff) | |
| download | ruby-6d69a240b86c10f128347a681c731c5cda972e22.tar.gz | |
* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
and WEBrick::CGI#config. these are necessary to use an instance of
WEBrick::CGI as the first argument of HTTPServlet#get_instance.
(suggested by Tatsuki Sugiura)
* lib/webrick/cgi.rb
(WEBrick::CGI#initalize): set a dummy to @config[:ServerSoftware]
if SERVER_SOFTWARE environment variable is not given.
(WEBrick::CGI#start): req.path_info must be a String.
(WEBrick::CGI::Socket#request_line): treat REQUEST_METHOD, PATH_INFO
and SCRIPT_NAME to run in console.
* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
not use String#split("/"). it removes trailing empty path component.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/webrick/test_httputils.rb | 6 | ||||
| -rw-r--r-- | test/webrick/webrick.cgi | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/test/webrick/test_httputils.rb b/test/webrick/test_httputils.rb index 88eeb82d8f..9d39ff53ab 100644 --- a/test/webrick/test_httputils.rb +++ b/test/webrick/test_httputils.rb @@ -87,4 +87,10 @@ class TestWEBrickHTTPUtils < Test::Unit::TestCase assert_equal("//foo/bar baz", unescape_form("/%2Ffoo/bar+baz")) assert_equal("/~foo/bar baz", unescape_form("/%7Efoo/bar+baz")) end + + def test_escape_path + assert_equal("/foo/bar", escape_path("/foo/bar")) + assert_equal("/foo/bar/", escape_path("/foo/bar/")) + assert_equal("/%25foo/bar/", escape_path("/%foo/bar/")) + end end diff --git a/test/webrick/webrick.cgi b/test/webrick/webrick.cgi index 97e1377454..ac525fb07d 100644 --- a/test/webrick/webrick.cgi +++ b/test/webrick/webrick.cgi @@ -4,7 +4,7 @@ require "webrick/cgi" class TestApp < WEBrick::CGI def do_GET(req, res) res["content-type"] = "text/plain" - if p = req.path_info + if (p = req.path_info) && p.length > 0 res.body = p elsif (q = req.query).size > 0 res.body = q.keys.sort.collect{|key| |