diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-10 09:40:34 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-10 09:40:34 +0000 |
| commit | 82a63f3daa7472ce6c03bd7b68ea73fde1046754 (patch) | |
| tree | c2c336843d66b0fb6571b71b76f7f9fceb800232 /lib/net | |
| parent | 760f8736c02647751f7d497e0fbfe770ff40c432 (diff) | |
merge revision(s) 17868:
* lib/net/ftp.rb (Net::FTP#sendport): use divmod. [ruby-core:17557]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
| -rw-r--r-- | lib/net/ftp.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index c3059deea3..ca2c00a790 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -278,12 +278,9 @@ module Net def sendport(host, port) af = (@sock.peeraddr)[0] if af == "AF_INET" - hbytes = host.split(".") - pbytes = [port / 256, port % 256] - bytes = hbytes + pbytes - cmd = "PORT " + bytes.join(",") + cmd = "PORT " + (host.split(".") + port.divmod(256)).join(",") elsif af == "AF_INET6" - cmd = "EPRT |2|" + host + "|" + sprintf("%d", port) + "|" + cmd = sprintf("EPRT |2|%s|%d|", host, port) else raise FTPProtoError, host end |