yugui	2010-12-08 17:08:46 +0900 (Wed, 08 Dec 2010)

  New Revision: 30126

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

  Log:
    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]

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30125)
+++ ruby_1_9_2/ChangeLog	(revision 30126)
@@ -1,3 +1,8 @@
+Mon Oct 18 10:19:00 2010  NARUSE, Yui  <naruse@r...>
+
+	* lib/net/http.rb (transport_request): @socket may be nil.
+	  patched by Egbert Eich [ruby-core:32829]
+
 Sun Oct 17 10:40:17 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* class.c (rb_define_{class,module}_id_under): register to be
Index: ruby_1_9_2/lib/net/http.rb
===================================================================
--- ruby_1_9_2/lib/net/http.rb	(revision 30125)
+++ ruby_1_9_2/lib/net/http.rb	(revision 30126)
@@ -1189,7 +1189,7 @@
       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
 
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30125)
+++ ruby_1_9_2/version.h	(revision 30126)
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 80
+#define RUBY_PATCHLEVEL 81
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 2
-#define RUBY_RELEASE_DATE "2010-12-02"
+#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DATE "2010-12-08"
 
 #include "ruby/version.h"
 

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