diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/ftp.rb | 2 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Jan 13 04:39:30 2009 Shugo Maeda <shugo@ruby-lang.org> + + * 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@ruby-lang.org> * gc.c (gc_sweep, obj_free, run_final): defer finalizers of IO and diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 737a7ebca1..40c79c885d 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -374,9 +374,11 @@ module Net 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 @@ -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[]; |