From 6cef092f68e7c1f147c64c4462b025f3ffddeed5 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 19 Nov 2009 06:32:19 +0000 Subject: merge revision(s) 25098: * lib/net/http.rb (transport_request): Handle timeout error by closing socket if exception raised. [ruby-core:20976] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/net/http.rb | 4 ++++ version.h | 8 ++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2306f4290b..6786ef5586 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 19 15:27:17 2009 Marc-Andre Lafortune + + * lib/net/http.rb (transport_request): Handle timeout error by + closing socket if exception raised. [ruby-core:20976] + Wed Nov 18 14:14:38 2009 Marc-Andre Lafortune * ext/openssl/ossl_config.c (ossl_config_add_value_m, diff --git a/lib/net/http.rb b/lib/net/http.rb index 7dd1f24d4c..869773bc92 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1055,6 +1055,10 @@ module Net #:nodoc: end_transport req, res res + rescue => exception + D "Conn close because of error #{exception}" + @socket.close unless @socket.closed? + raise exception end private diff --git a/version.h b/version.h index b74e935fda..500d79fae7 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-11-18" +#define RUBY_RELEASE_DATE "2009-11-19" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20091118 -#define RUBY_PATCHLEVEL 212 +#define RUBY_RELEASE_CODE 20091119 +#define RUBY_PATCHLEVEL 213 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DAY 19 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3