mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
webrick: handle EAGAIN/EWOULDBLOCK on proxy connections
* lib/webrick/httpproxy.rb (do_CONNECT): high-level IO methods [ruby-core:82861] [Bug #12130] Patch by: Keisuke NISHI git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
eccbd8c0ef
commit
b40a9475db
1 changed files with 4 additions and 4 deletions
|
@ -193,13 +193,13 @@ module WEBrick
|
||||||
begin
|
begin
|
||||||
while fds = IO::select([ua, os])
|
while fds = IO::select([ua, os])
|
||||||
if fds[0].member?(ua)
|
if fds[0].member?(ua)
|
||||||
buf = ua.sysread(1024);
|
buf = ua.readpartial(1024);
|
||||||
@logger.debug("CONNECT: #{buf.bytesize} byte from User-Agent")
|
@logger.debug("CONNECT: #{buf.bytesize} byte from User-Agent")
|
||||||
os.syswrite(buf)
|
os.write(buf)
|
||||||
elsif fds[0].member?(os)
|
elsif fds[0].member?(os)
|
||||||
buf = os.sysread(1024);
|
buf = os.readpartial(1024);
|
||||||
@logger.debug("CONNECT: #{buf.bytesize} byte from #{host}:#{port}")
|
@logger.debug("CONNECT: #{buf.bytesize} byte from #{host}:#{port}")
|
||||||
ua.syswrite(buf)
|
ua.write(buf)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue
|
rescue
|
||||||
|
|
Loading…
Reference in a new issue