shyouhei	2010-11-22 16:22:19 +0900 (Mon, 22 Nov 2010)

  New Revision: 29865

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

  Log:
    Mon, 18 Oct 2010 01:23:48 +0000  naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
     merge revision(s) 29524:
     
     	* 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_8@29524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/net/http.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 29864)
+++ ruby_1_8_7/ChangeLog	(revision 29865)
@@ -1,3 +1,8 @@
+Mon Oct 18 10:21:01 2010  NARUSE, Yui  <naruse@r...>
+
+	* lib/net/http.rb (transport_request): @socket may be nil.
+	  patched by Egbert Eich [ruby-core:32829]
+
 Fri Oct  8 10:51:56 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (RBCONFIG): depends on version.h due to
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 29864)
+++ ruby_1_8_7/version.h	(revision 29865)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-11-22"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20101122
-#define RUBY_PATCHLEVEL 314
+#define RUBY_PATCHLEVEL 315
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/net/http.rb
===================================================================
--- ruby_1_8_7/lib/net/http.rb	(revision 29864)
+++ ruby_1_8_7/lib/net/http.rb	(revision 29865)
@@ -1056,7 +1056,7 @@
         end_transport req, 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
 

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