string.c: CRLF in paragraph mode

* string.c (rb_str_enumerate_lines): allow CRLF to separate
  paragraphs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 0 deletions

diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index d1da27bdb3..f2fcf3fb25 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -785,6 +785,11 @@ CODE
     assert_equal(S("hello\n\n"), res[0])
     assert_equal(S("world"),     res[1])
 
+    res=[]
+    S("hello\r\n\r\nworld").each_line(S('')) {|x| res << x}
+    assert_equal(S("hello\r\n\r\n"), res[0])
+    assert_equal(S("world"),         res[1])
+
     $/ = "!"
 
     res=[]
@@ -828,6 +833,11 @@ CODE
     assert_equal(S("world"),   res[1])
 
     res = []
+    S("hello\r\n\r\nworld").each_line(S(''), chomp: true) {|x| res << x}
+    assert_equal(S("hello\r\n"), res[0])
+    assert_equal(S("world"),     res[1])
+
+    res = []
     S("hello!world").each_line(S('!'), chomp: true) {|x| res << x}
     assert_equal(S("hello"), res[0])
     assert_equal(S("world"), res[1])