summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-30 04:27:12 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-30 04:27:12 +0000
commit8bfcb85408829cbf2e42493711fac934f06cbbe8 (patch)
tree4feddc98b206951ca83b35452a1be1e2f49d519f
parent22b9c0a4dbd38c328ca75a4dc14cbd525a65fec5 (diff)
* lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
responses for some FTP servers. (backported from HEAD) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/ftp.rb4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 27a3b8c122..34e46546f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 30 13:27:40 2007 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
+ responses for some FTP servers. (backported from HEAD)
+
Wed May 30 05:17:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index dfbcf1499f..c3059deea3 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -322,6 +322,8 @@ module Net
end
end
resp = sendcmd(cmd)
+ # skip 2XX for some ftp servers
+ resp = getresp if resp[0] == ?2
if resp[0] != ?1
raise FTPReplyError, resp
end
@@ -334,6 +336,8 @@ module Net
end
end
resp = sendcmd(cmd)
+ # skip 2XX for some ftp servers
+ resp = getresp if resp[0] == ?2
if resp[0] != ?1
raise FTPReplyError, resp
end