From b44d2a8450fa05043e70bddca454161e6a9138d4 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 11 Nov 2008 11:01:31 +0000 Subject: merges r20152 from trunk into ruby_1_9_1. * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#do_CONNECT): use #bytesize instead of #size. a patch submitted from raspberry lemon in [ruby-core:18571]. * lib/webrick/httpauth/digestauth.rb, lib/webrick/httpproxy.rb, lib/webrick/httprequest.rb, lib/webrick/httpservlet/cgi_runner.rb, lib/webrick/httpservlet/abstract.rb, lib/webrick/httpresponse.rb, lib/webrick/httpservlet/cgihandler.rb, lib/webrick/utils.rb: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/webrick/httpservlet/abstract.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/webrick/httpservlet/abstract.rb') diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb index 5375c4622..2a0a4049f 100644 --- a/lib/webrick/httpservlet/abstract.rb +++ b/lib/webrick/httpservlet/abstract.rb @@ -59,7 +59,7 @@ module WEBrick def redirect_to_directory_uri(req, res) if req.path[-1] != ?/ location = WEBrick::HTTPUtils.escape_path(req.path + "/") - if req.query_string && req.query_string.size > 0 + if req.query_string && req.query_string.bytesize > 0 location << "?" << req.query_string end res.set_redirect(HTTPStatus::MovedPermanently, location) -- cgit