diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-06 05:30:17 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-06 05:30:17 +0000 |
| commit | ccd7a805cc4ceb274ece6ba519fa233ed8d210c2 (patch) | |
| tree | 3c0996fe1ae2a0ee0f1d8cf6dc2346b25264fd37 | |
| parent | a6ec2584527fb4d6f3a65a2dd16dc02eabdfcec6 (diff) | |
* lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line):
don't use /n in universal regexp. [ruby-dev:46394] [Bug #7278]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/protocol.rb | 2 | ||||
| -rw-r--r-- | test/net/protocol/test_protocol.rb | 11 |
3 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Nov 6 14:25:09 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line): + don't use /n in universal regexp. [ruby-dev:46394] [Bug #7278] + Tue Nov 6 09:42:26 2012 NARUSE, Yui <naruse@ruby-lang.org> * string.c (rb_str_b): Add String#b, returning a copied string diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 9733d56c93..6b79f9efcc 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -322,7 +322,7 @@ module Net # :nodoc: def each_crlf_line(src) buffer_filling(@wbuf, src) do - while line = @wbuf.slice!(/\A.*(?:\n|\r\n|\r(?!\z))/n) + while line = @wbuf.slice!(/\A.*(?:\n|\r\n|\r(?!\z))/) yield line.chomp("\n") + "\r\n" end end diff --git a/test/net/protocol/test_protocol.rb b/test/net/protocol/test_protocol.rb new file mode 100644 index 0000000000..5fe3023015 --- /dev/null +++ b/test/net/protocol/test_protocol.rb @@ -0,0 +1,11 @@ +require "test/unit" +require "net/protocol" +require "stringio" + +class TestProtocol < Test::Unit::TestCase + def test_each_crlf_line + assert_output('', '') do + Net::InternetMessageIO.new(StringIO.new("")).write_message("\u3042\r\n\u3044\r\n\u3046") + end + end +end |