shyouhei	2009-01-13 04:39:50 +0900 (Tue, 13 Jan 2009)

  New Revision: 21478

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

  Log:
    merge revision(s) 18417:
    * lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
      is not supplied.  backported from trunk.  fixed [ruby-core:18058].

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

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21477)
+++ ruby_1_8_6/ChangeLog	(revision 21478)
@@ -1,3 +1,8 @@
+Tue Jan 13 04:39:30 2009  Shugo Maeda  <shugo@r...>
+
+	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
+	  is not supplied.  backported from trunk.  fixed [ruby-core:18058].
+
 Mon Jan 12 00:21:49 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* gc.c (gc_sweep, obj_free, run_final): defer finalizers of IO and
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21477)
+++ ruby_1_8_6/version.h	(revision 21478)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-12"
+#define RUBY_RELEASE_DATE "2009-01-13"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090112
-#define RUBY_PATCHLEVEL 296
+#define RUBY_RELEASE_CODE 20090113
+#define RUBY_PATCHLEVEL 297
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/lib/net/ftp.rb
===================================================================
--- ruby_1_8_6/lib/net/ftp.rb	(revision 21477)
+++ ruby_1_8_6/lib/net/ftp.rb	(revision 21478)
@@ -374,9 +374,11 @@
       synchronize do
 	resp = sendcmd('USER ' + user)
 	if resp[0] == ?3
+          raise FTPReplyError, resp if passwd.nil?
 	  resp = sendcmd('PASS ' + passwd)
 	end
 	if resp[0] == ?3
+          raise FTPReplyError, resp if acct.nil?
 	  resp = sendcmd('ACCT ' + acct)
 	end
       end

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