diff options
| -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:19:00 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@ruby-lang.org> * class.c (rb_define_{class,module}_id_under): register to be diff --git a/lib/net/http.rb b/lib/net/http.rb index d4329e53c3..5407975851 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1189,7 +1189,7 @@ module Net #:nodoc: 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,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" |