summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-11 02:32:47 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-11 02:32:47 +0000
commit720dc250a1658134eef68f64b452399815130942 (patch)
tree863b4c328841d8314b44b5360cef564fc8c3545c
parentf67887c18e3cec3d912bef65852aa6caa1e7682e (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_6@21427 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/ftp.rb6
-rw-r--r--version.h8
3 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5eb4356326..7ec3d689f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/version.h b/version.h
index 4f3491b319..a2deadbc5e 100644
--- a/version.h
+++ b/version.h
@@ -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[];