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/httpproxy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/webrick/httpproxy.rb') diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb index 29ee1057e..f35a17777 100644 --- a/lib/webrick/httpproxy.rb +++ b/lib/webrick/httpproxy.rb @@ -146,11 +146,11 @@ module WEBrick while fds = IO::select([ua, os]) if fds[0].member?(ua) buf = ua.sysread(1024); - @logger.debug("CONNECT: #{buf.size} byte from User-Agent") + @logger.debug("CONNECT: #{buf.bytesize} byte from User-Agent") os.syswrite(buf) elsif fds[0].member?(os) buf = os.sysread(1024); - @logger.debug("CONNECT: #{buf.size} byte from #{host}:#{port}") + @logger.debug("CONNECT: #{buf.bytesize} byte from #{host}:#{port}") ua.syswrite(buf) end end -- cgit