[ruby-cvs:58704] nagachika:r51556 (ruby_2_2): merge revision(s) 51046: [Backport #11260]

[nagachika at ruby-lang.org]

nagachika	2015-08-13 01:40:08 +0900 (Thu, 13 Aug 2015)

  New Revision: 51556

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

  Log:
    merge revision(s) 51046: [Backport #11260]
    
    * lib/net/ftp.rb (makeport): close the TCPServer
      when sending the port fails.
    
    * test/net/ftp/test_ftp.rb: test for above.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/net/ftp.rb
    branches/ruby_2_2/test/net/ftp/test_ftp.rb
    branches/ruby_2_2/version.h