Permalink
Browse files

Mon, 18 Oct 2010 01:23:48 +0000 naruse <naruse@b2dd03c8-39d4-4d8f-98f…

…f-823fe69b080e>

 merge revision(s) 29524:
 ?\012
 	* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@29865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 2e822d4 commit d4765036d869f77f7e8d7cd58283f4e82bcaff42 @shyouhei shyouhei committed Nov 22, 2010
Showing with 7 additions and 2 deletions.
  1. +5 −0 ChangeLog
  2. +1 −1 lib/net/http.rb
  3. +1 −1 version.h
View
@@ -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
View
@@ -1056,7 +1056,7 @@ def request(req, body = nil, &block) # :yield: +response+
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
View
@@ -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

0 comments on commit d476503

Please sign in to comment.