marcandre	2009-09-26 13:27:07 +0900 (Sat, 26 Sep 2009)

  New Revision: 25097

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25097

  Log:
    * lib/net/http.rb (transport_request): Handle timeout error by closing socket if exception raised. [ruby-core:20976]

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/http.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25096)
+++ ChangeLog	(revision 25097)
@@ -1,3 +1,8 @@
+Sat Sep 26 13:26:55 2009  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* lib/net/http.rb (transport_request): Handle timeout error by
+	  closing socket if exception raised. [ruby-core:20976]
+
 Sat Sep 26 08:35:12 2009  Koichi Sasada  <ko1@a...>
 
 	* iseq.c (compile_string): rename to parse_string(), because
Index: lib/net/http.rb
===================================================================
--- lib/net/http.rb	(revision 25096)
+++ lib/net/http.rb	(revision 25097)
@@ -1124,6 +1124,10 @@
       }
       end_transport req, res
       res
+    rescue => exception
+      D "Conn close because of error #{exception}"
+      @socket.close unless @socket.closed?
+      raise exception
     end
 
     def begin_transport(req)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/