diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-08 08:08:46 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-08 08:08:46 +0000 |
commit | f87402c392623ec272e8d0b46845f9de67a5b961 (patch) | |
tree | 06b11e0737f9498c25ab9fa68bb09edd17c14785 /lib | |
parent | b1d2491fb42e3c5f254ac761db736d0129d0ebd5 (diff) |
merges r29523 from trunk into ruby_1_9_2.
--
* lib/net/http.rb (transport_request): @socket may be nil.
patched by Egbert Eich [ruby-core:32829]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/http.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index d4329e53c3..5407975851 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1189,7 +1189,7 @@ module Net #:nodoc: res rescue => exception D "Conn close because of error #{exception}" - @socket.close unless @socket.closed? + @socket.close if @socket and not @socket.closed? raise exception end |