summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-30 11:23:15 +0000
committerjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-30 11:23:15 +0000
commit0fc23bda529a9c8072eaee7db103f679aafa37b8 (patch)
tree4ce6788a048d14a7c4a063a4eeb7e86ddb2fa7f2 /ChangeLog
parentcd8aabdafae01d0dfa6ab84f200331281ac15773 (diff)
Merged 16241 from trunk.
* lib/net/telnet.rb: Fixing a bug where line endings would not be properly escaped when the two character ending was broken up into separate TCP packets. Issue reported and patched by Brian Candler. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16242 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f7d58b2ca9..69b1823819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Apr 30 20:22:40 2008 James Edward Gray II <jeg2@ruby-lang.org>
+
+ Merged 16241 from trunk.
+
+ * lib/net/telnet.rb: Fixing a bug where line endings would not be properly
+ escaped when the two character ending was broken up into separate TCP
+ packets. Issue reported and patched by Brian Candler.
+
Wed Apr 30 17:47:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* re.c (rb_reg_search): use local variable. a patch from wanabe