From c35e7519b948e765d0f64f014775ce955a5c17de Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 15 Jan 2013 07:23:48 +0000 Subject: merge revision(s) 37487,37563: [Backport #7278] * lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line): don't use /n in universal regexp. [ruby-dev:46394] [Bug #7278] * lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line): treat \r as newline as mame pointed. [ruby-dev:46425] [Bug #7278] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ lib/net/protocol.rb | 2 +- test/net/protocol/test_protocol.rb | 19 +++++++++++++++++++ version.h | 2 +- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 test/net/protocol/test_protocol.rb diff --git a/ChangeLog b/ChangeLog index 228d2c5b23..640c970f81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Tue Jan 15 16:23:30 2013 NARUSE, Yui + + * lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line): + treat \r as newline as mame pointed. [ruby-dev:46425] [Bug #7278] + +Tue Jan 15 16:23:30 2013 NARUSE, Yui + + * lib/net/protocol.rb (Net::InternetMessageIO#each_crlf_line): + don't use /n in universal regexp. [ruby-dev:46394] [Bug #7278] + Tue Jan 15 16:13:47 2013 Kenta Murata * ext/bigdecimal/bigdecimal.c (BigDecimal_to_s): use CRuby style. diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index ab0e70e609..f3744661f5 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -310,7 +310,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[^\r\n]*(?:\n|\r(?:\n|(?!\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..f6ee4941cf --- /dev/null +++ b/test/net/protocol/test_protocol.rb @@ -0,0 +1,19 @@ +require "test/unit" +require "net/protocol" +require "stringio" + +class TestProtocol < Test::Unit::TestCase + def test_each_crlf_line + assert_output('', '') do + sio = StringIO.new("") + imio = Net::InternetMessageIO.new(sio) + assert_equal(23, imio.write_message("\u3042\r\u3044\n\u3046\r\n\u3048")) + assert_equal("\u3042\r\n\u3044\r\n\u3046\r\n\u3048\r\n.\r\n", sio.string) + + sio = StringIO.new("") + imio = Net::InternetMessageIO.new(sio) + assert_equal(8, imio.write_message("\u3042\r")) + assert_equal("\u3042\r\n.\r\n", sio.string) + end + end +end diff --git a/version.h b/version.h index 8d190d3153..1a0b29ddbc 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 370 +#define RUBY_PATCHLEVEL 371 #define RUBY_RELEASE_DATE "2013-01-15" #define RUBY_RELEASE_YEAR 2013 -- cgit v1.2.3