naruse	2010-10-18 10:23:48 +0900 (Mon, 18 Oct 2010)

  New Revision: 29524

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

  Log:
    * lib/net/http.rb (transport_request): @socket may be nil.
      patched by Egbert Eich [ruby-core:32829]

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

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 29523)
+++ ruby_1_8/ChangeLog	(revision 29524)
@@ -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]
+
 Mon Oct 11 18:06:57 2010  Akinori MUSHA  <knu@i...>
 
 	* parse.y (opt_block_arg): Allow a trailing comma at the end of
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 29523)
+++ ruby_1_8/version.h	(revision 29524)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-10-11"
+#define RUBY_RELEASE_DATE "2010-10-18"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20101011
+#define RUBY_RELEASE_CODE 20101018
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 18
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_8/lib/net/http.rb
===================================================================
--- ruby_1_8/lib/net/http.rb	(revision 29523)
+++ ruby_1_8/lib/net/http.rb	(revision 29524)
@@ -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/