mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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_6@21478 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
869c7d91f7
commit
95f1f18d06
3 changed files with 11 additions and 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
|
||||
|
|
|
|||
|
|
@ -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[];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue