diff options
| -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:31:52 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:22:24 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 bee60d559c..737a7ebca1 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -664,9 +664,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.6" -#define RUBY_RELEASE_DATE "2009-01-09" +#define RUBY_RELEASE_DATE "2009-01-11" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090109 -#define RUBY_PATCHLEVEL 294 +#define RUBY_RELEASE_CODE 20090111 +#define RUBY_PATCHLEVEL 295 #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 9 +#define RUBY_RELEASE_DAY 11 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |