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@ruby-lang.org>



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8c4c1fd53c..35b63ea72b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 18 10:21:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* common.mk (RBCONFIG): depends on version.h due to
diff --git a/lib/net/http.rb b/lib/net/http.rb
index cd4d51071f..eba67916c6 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1056,7 +1056,7 @@ module Net   #:nodoc:
         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
 
diff --git a/version.h b/version.h
index b8a1cda54a..e39e99c472 100644
--- a/version.h
+++ b/version.h
@@ -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