nagachika	2018-03-21 02:55:34 +0900 (Wed, 21 Mar 2018)

  New Revision: 62867

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62867

  Log:
    merge revision(s) 61639: [Backport #14323]
    
    net/ftp: fix FrozenError in BufferedSocket
    
    I noticed this bug while working on something else with
    RUBYOPT=-d on, existing test cases all passed with it.
    
    Note: I use String.new because it is the local style, here,
    I prefer +'' (or ''.b, for a future commit)
    
    * lib/net/ftp.rb (BufferedSocket#read): use String.new
    * test/net/ftp/test_buffered_socket.rb (test_read_nil): new test
      [ruby-core:84675] [Bug #14323]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/lib/net/ftp.rb
    branches/ruby_2_4/test/net/ftp/test_buffered_socket.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 62866)
+++ ruby_2_4/version.h	(revision 62867)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.4"
 #define RUBY_RELEASE_DATE "2018-03-21"
-#define RUBY_PATCHLEVEL 275
+#define RUBY_PATCHLEVEL 276
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/lib/net/ftp.rb
===================================================================
--- ruby_2_4/lib/net/ftp.rb	(revision 62866)
+++ ruby_2_4/lib/net/ftp.rb	(revision 62867)
@@ -1434,7 +1434,7 @@ module Net https://github.com/ruby/ruby/blob/trunk/ruby_2_4/lib/net/ftp.rb#L1434
           s = super(len, String.new, true)
           return s.empty? ? nil : s
         else
-          result = ""
+          result = String.new
           while s = super(DEFAULT_BLOCKSIZE, String.new, true)
             break if s.empty?
             result << s
Index: ruby_2_4/test/net/ftp/test_buffered_socket.rb
===================================================================
--- ruby_2_4/test/net/ftp/test_buffered_socket.rb	(revision 62866)
+++ ruby_2_4/test/net/ftp/test_buffered_socket.rb	(revision 62867)
@@ -33,6 +33,12 @@ class BufferedSocketTest < Test::Unit::T https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/net/ftp/test_buffered_socket.rb#L33
     assert_equal("bar", sock.gets)
   end
 
+  def test_read_nil
+    sock = create_buffered_socket("foo\nbar")
+    assert_equal("foo\nbar", sock.read)
+    assert_equal("", sock.read)
+  end
+
   private
 
   def create_buffered_socket(s)
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 62866)
+++ ruby_2_4	(revision 62867)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r61639

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/