summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-22 07:22:19 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-22 07:22:19 +0000
commit134e2d619a3c4d52021a7ceda17c173e63e6e588 (patch)
tree5e5620fd4a4c9d0ee5f080fbf32344206eefb025 /ChangeLog
parentc233358e654fd345820efcdfc4b01d1e34d7e993 (diff)
Mon, 18 Oct 2010 01:23:48 +0000 naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
merge revision(s) 29524: * 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29865 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 8c4c1fd53c..35b63ea72b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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