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 --- lib/net/protocol.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3