diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-19 06:32:19 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-19 06:32:19 +0000 |
commit | 6cef092f68e7c1f147c64c4462b025f3ffddeed5 (patch) | |
tree | 5b884d6ca39fa42fbb01f79aeb16163ef21d16fe /lib/net/http.rb | |
parent | 5b3f05ab6a7b779c62eb6238ed076094c93c4092 (diff) |
merge revision(s) 25098:
* lib/net/http.rb (transport_request): Handle timeout error by
closing socket if exception raised. [ruby-core:20976]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net/http.rb')
-rw-r--r-- | lib/net/http.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index 7dd1f24d4c..869773bc92 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1055,6 +1055,10 @@ module Net #:nodoc: end_transport req, res res + rescue => exception + D "Conn close because of error #{exception}" + @socket.close unless @socket.closed? + raise exception end private |