diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:46:47 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:46:47 +0000 |
commit | 5b928320753e20daa7b9ddcac1c3c3e7f8651286 (patch) | |
tree | ce5a279aec63878a540e57d968593c512e02d0de /lib/net | |
parent | 2298cb6ce4bc82c3faafa7eb3a5dbbc5edb80813 (diff) |
merges r25313 from trunk into ruby_1_9_1.
--
* lib/net/ftp.rb (login): use "anonymous@" as a default password.
[ruby-dev:39451]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-rw-r--r-- | lib/net/ftp.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 06cc3eafa2..4a7a6a72c9 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -389,7 +389,7 @@ module Net # def login(user = "anonymous", passwd = nil, acct = nil) if user == "anonymous" and passwd == nil - passwd = getaddress + passwd = (getaddress rescue "anonymous@") end resp = "" |