ruby-changes:9940
From: shyouhei <ko1@a...>
Date: Tue, 13 Jan 2009 04:41:06 +0900 (JST)
Subject: [ruby-changes:9940] Ruby:r21480 (ruby_1_8_7): merge revision(s) 18417:
shyouhei 2009-01-13 04:40:39 +0900 (Tue, 13 Jan 2009) New Revision: 21480 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21480 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_7/ChangeLog branches/ruby_1_8_7/lib/net/ftp.rb branches/ruby_1_8_7/version.h Index: ruby_1_8_7/ChangeLog =================================================================== --- ruby_1_8_7/ChangeLog (revision 21479) +++ ruby_1_8_7/ChangeLog (revision 21480) @@ -1,3 +1,8 @@ +Tue Jan 13 04:40: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:23:37 2009 Nobuyoshi Nakada <nobu@r...> * gc.c (gc_sweep, obj_free, run_final): defer finalizers of IO and Index: ruby_1_8_7/version.h =================================================================== --- ruby_1_8_7/version.h (revision 21479) +++ ruby_1_8_7/version.h (revision 21480) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-01-12" +#define RUBY_RELEASE_DATE "2009-01-13" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090112 -#define RUBY_PATCHLEVEL 83 +#define RUBY_RELEASE_CODE 20090113 +#define RUBY_PATCHLEVEL 84 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #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_7/lib/net/ftp.rb =================================================================== --- ruby_1_8_7/lib/net/ftp.rb (revision 21479) +++ ruby_1_8_7/lib/net/ftp.rb (revision 21480) @@ -378,9 +378,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/