diff options
author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-05 08:53:37 +0000 |
---|---|---|
committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-05 08:53:37 +0000 |
commit | c9d51e1294ca6d66beb152dce030d95f95a74988 (patch) | |
tree | 83d0fff6b16698a766d6d767d5d35c8c28533bc4 | |
parent | 0b0db73683a163b62556e3c39320b350642e3191 (diff) |
protocol.rb version 1.1.17 for ruby 1.4 branch
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/net/http.rb | 12 | ||||
-rw-r--r-- | lib/net/protocol.rb | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index 4e284a5af4..2a7190f126 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -420,7 +420,11 @@ All "key" is case-insensitive. @http_version = HTTPVersion @in_header = {} - @in_header[ 'Host' ] = sock.addr + if sock.port == HTTP.port + @in_header[ 'Host' ] = sock.addr + else + @in_header[ 'Host' ] = sock.addr + ':' + sock.port + end @in_header[ 'Connection' ] = 'Keep-Alive' @in_header[ 'Accept' ] = '*/*' @@ -505,6 +509,12 @@ All "key" is case-insensitive. if tmp and /close/i === tmp then @socket.read_all dest @socket.close + else + tmp = resp['proxy-connection'] + if tmp and /close/i === tmp then + @socket.read_all dest + @socket.close + end end end end diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 81e8e987eb..1d909bbb4b 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -15,7 +15,7 @@ require 'socket' module Net - Version = '1.1.16' + Version = '1.1.17' =begin |