yugui	2010-01-30 21:46:47 +0900 (Sat, 30 Jan 2010)

  New Revision: 26482

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

  Log:
    merges r25313 from trunk into ruby_1_9_1.
    --
    * lib/net/ftp.rb (login): use "anonymous@" as a default password.
      [ruby-dev:39451]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/net/ftp.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26481)
+++ ruby_1_9_1/ChangeLog	(revision 26482)
@@ -1,3 +1,8 @@
+Mon Oct 12 23:27:57 2009  Shugo Maeda  <shugo@r...>
+
+	* lib/net/ftp.rb (login): use "anonymous@" as a default password.
+	  [ruby-dev:39451]
+
 Sun Oct 11 15:54:52 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/gdbm/gdbm.c (fgdbm_select): fixed rdoc.  a patch from Justin
Index: ruby_1_9_1/lib/net/ftp.rb
===================================================================
--- ruby_1_9_1/lib/net/ftp.rb	(revision 26481)
+++ ruby_1_9_1/lib/net/ftp.rb	(revision 26482)
@@ -389,7 +389,7 @@
     #
     def login(user = "anonymous", passwd = nil, acct = nil)
       if user == "anonymous" and passwd == nil
-	passwd = getaddress
+        passwd = (getaddress rescue "anonymous@")
       end
       
       resp = ""
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26481)
+++ ruby_1_9_1/version.h	(revision 26482)
@@ -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

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