summaryrefslogtreecommitdiff
path: root/lib/net/ftp.rb
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-07-11 08:22:18 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-07-11 08:22:18 +0000
commitbe1d2c5f685d56e10239565e5eefba191de0e0be (patch)
treeca2c2a97c4a87726d0d70fed72954eea67110189 /lib/net/ftp.rb
parentda72e5a64442c9649689f347e2cc237ec3f41bf8 (diff)
* string.c (rb_str_slice_bang): if there's no corresponding
substring, slice! should return nil without exception. * array.c (rb_ary_insert): type fixed. * string.c (rb_str_split_m): accept separator value nil as well. * string.c (rb_str_become): was leaking memory. * class.c (rb_include_module): should not alter other classes/modules by inclusion. by this fix, local order may not be preserved for some cases. * class.c (include_class_new): module may be T_ICLASS; retrieve original module information. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net/ftp.rb')
-rw-r--r--lib/net/ftp.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 1d8cbba554..75e087a20c 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -55,7 +55,7 @@ module Net
@passive = true
return SOCKSsocket.open(host, port)
else
- return TCPsocket.open(host, port)
+ return TCPSocket.open(host, port)
end
end
private :open_socket
@@ -173,7 +173,7 @@ module Net
private :sendport
def makeport
- sock = TCPserver.open(@sock.addr[3], 0)
+ sock = TCPServer.open(@sock.addr[3], 0)
port = sock.addr[1]
host = sock.addr[3]
resp = sendport(host, port)