summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-19 06:32:19 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-19 06:32:19 +0000
commit6cef092f68e7c1f147c64c4462b025f3ffddeed5 (patch)
tree5b884d6ca39fa42fbb01f79aeb16163ef21d16fe /ChangeLog
parent5b3f05ab6a7b779c62eb6238ed076094c93c4092 (diff)
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
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 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 <ruby-core@marc-andre.ca>
+
+ * 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 <ruby-core@marc-andre.ca>
* ext/openssl/ossl_config.c (ossl_config_add_value_m,