From 249569fd8e6ba2c10082ab3eaaff6d1230998f01 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 27 Oct 2009 13:50:42 +0000 Subject: * lib/net/ftp.rb (Net::FTP#initialize): @sock = nil. * lib/net/ftp.rb (Net::FTP#binary=): send command only when socket is open. [ruby-dev:39548] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/net/ftp.rb | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee66d55415..629765504a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Oct 27 22:46:44 2009 NARUSE, Yui + + * lib/net/ftp.rb (Net::FTP#initialize): @sock = nil. + + * lib/net/ftp.rb (Net::FTP#binary=): send command only when + socket is open. [ruby-dev:39548] + Tue Oct 27 22:22:38 2009 Nobuyoshi Nakada * ext/stringio/stringio.c (Init_stringio): added read_nonblock and diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 52bd37595d..239bd3cbc6 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -132,6 +132,7 @@ module Net @passive = false @debug_mode = false @resume = false + @sock = nil if host connect(host) if user @@ -143,7 +144,7 @@ module Net def binary=(newmode) if newmode != @binary @binary = newmode - @binary ? voidcmd("TYPE I") : voidcmd("TYPE A") + @binary ? voidcmd("TYPE I") : voidcmd("TYPE A") unless closed? end end -- cgit v1.2.3