shugo	2016-11-29 17:44:21 +0900 (Tue, 29 Nov 2016)

  New Revision: 56925

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

  Log:
    Suppress warnings.

  Modified files:
    trunk/lib/net/ftp.rb
    trunk/test/net/ftp/test_ftp.rb
Index: test/net/ftp/test_ftp.rb
===================================================================
--- test/net/ftp/test_ftp.rb	(revision 56924)
+++ test/net/ftp/test_ftp.rb	(revision 56925)
@@ -1009,8 +1009,8 @@ EOF https://github.com/ruby/ruby/blob/trunk/test/net/ftp/test_ftp.rb#L1009
       commands.push(sock.gets)
       sock.print("150 Opening TEXT mode data connection for foo (#{text_data.size} bytes)\r\n")
       conn = TCPSocket.new(host, port)
-      text_data.each_line do |line|
-        conn.print(line)
+      text_data.each_line do |l|
+        conn.print(l)
       end
       conn.shutdown(Socket::SHUT_WR)
       conn.read
@@ -1072,8 +1072,8 @@ EOF https://github.com/ruby/ruby/blob/trunk/test/net/ftp/test_ftp.rb#L1072
       commands.push(sock.gets)
       sock.print("150 Opening TEXT mode data connection for foo (#{text_data.size} bytes)\r\n")
       conn = TCPSocket.new(host, port)
-      text_data.each_line do |line|
-        conn.print(line)
+      text_data.each_line do |l|
+        conn.print(l)
       end
       conn.shutdown(Socket::SHUT_WR)
       conn.read
@@ -1132,8 +1132,8 @@ EOF https://github.com/ruby/ruby/blob/trunk/test/net/ftp/test_ftp.rb#L1132
       commands.push(sock.gets)
       sock.print("150 Opening TEXT mode data connection for foo (#{text_data.size} bytes)\r\n")
       conn = TCPSocket.new(host, port)
-      text_data.each_line do |line|
-        conn.print(line)
+      text_data.each_line do |l|
+        conn.print(l)
       end
       conn.shutdown(Socket::SHUT_WR)
       conn.read
@@ -1666,8 +1666,8 @@ EOF https://github.com/ruby/ruby/blob/trunk/test/net/ftp/test_ftp.rb#L1666
       sock.print("150 Here comes the directory listing.\r\n")
       begin
         conn = TCPSocket.new(host, port)
-        entry_lines.each do |line|
-          conn.print(line, "\r\n")
+        entry_lines.each do |l|
+          conn.print(l, "\r\n")
         end
       rescue Errno::EPIPE
       ensure
Index: lib/net/ftp.rb
===================================================================
--- lib/net/ftp.rb	(revision 56924)
+++ lib/net/ftp.rb	(revision 56925)
@@ -242,6 +242,7 @@ module Net https://github.com/ruby/ruby/blob/trunk/lib/net/ftp.rb#L242
           raise ArgumentError,
             "private_data_connection can be set to true only when ssl is enabled"
         end
+        @private_data_connection = false
       end
       @binary = true
       if options[:passive].nil?

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