diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-11 02:33:36 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-11 02:33:36 +0000 |
| commit | 3c299b5fe5d653e2ec231f6afb97445f8860c898 (patch) | |
| tree | a981108a067e6a82e977a3d3f0f42346272f04e6 | |
| parent | 375cd73c201314a38bb9ced9d5b96a683d24bf6b (diff) | |
merge revision(s) 18371:
* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
backported from trunk. fixed [ruby-core:18057].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/ftp.rb | 6 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Sun Jan 11 11:33:27 2009 Shugo Maeda <shugo@ruby-lang.org> + + * lib/net/ftp.rb (chdir): handle 5xx errors correctly. + backported from trunk. fixed [ruby-core:18057]. + Fri Jan 9 19:25:25 2009 Shugo Maeda <shugo@ruby-lang.org> * lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index ca2c00a790..2b195c2bab 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -668,9 +668,9 @@ module Net begin voidcmd("CDUP") return - rescue FTPPermError - if $![0, 3] != "500" - raise FTPPermError, $! + rescue FTPPermError => e + if e.message[0, 3] != "500" + raise e end end end @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-01-09" +#define RUBY_RELEASE_DATE "2009-01-11" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090109 -#define RUBY_PATCHLEVEL 81 +#define RUBY_RELEASE_CODE 20090111 +#define RUBY_PATCHLEVEL 82 #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 9 +#define RUBY_RELEASE_DAY 11 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |