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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 58c7a6bff4..e693a3c57b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 12 23:27:57 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (login): use "anonymous@" as a default password.
+	  [ruby-dev:39451]
+
 Sun Oct 11 15:54:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/gdbm/gdbm.c (fgdbm_select): fixed rdoc.  a patch from Justin
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 = ""
diff --git a/version.h b/version.h
index fe202309fa..a5096069ac 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 387
+#define RUBY_PATCHLEVEL 388
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1