diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-18 01:23:48 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-18 01:23:48 +0000 |
| commit | e2bca8dafafa99f23132454a5856abe363e1d1a4 (patch) | |
| tree | d6a5d97ff42410fa18bdf727b0f5347da373a091 | |
| parent | 57a9cb4c31ed1f29a93ac1da64b563a2ccbd91ab (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/http.rb | 2 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Mon Oct 18 10:21:01 2010 NARUSE, Yui <[email protected]> + + * 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 <[email protected]> * parse.y (opt_block_arg): Allow a trailing comma at the end of diff --git a/lib/net/http.rb b/lib/net/http.rb index e30f9c22eb..6672881a97 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 @@ -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 |