diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 19:40:39 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 19:40:39 +0000 |
commit | c65d935b4c13516fa695765b717001b6f5efdd12 (patch) | |
tree | 08d276ce0e11ddfaf50bdd1f4f22f866ca4e7fca | |
parent | f3a4870b42fcbaefd051b3754738a869b87098e2 (diff) |
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].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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:40: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:23:37 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 2b195c2bab..d890130ce7 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -378,9 +378,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.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[]; |