diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-07-11 08:22:18 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-07-11 08:22:18 +0000 |
| commit | be1d2c5f685d56e10239565e5eefba191de0e0be (patch) | |
| tree | ca2c2a97c4a87726d0d70fed72954eea67110189 /lib/net | |
| parent | da72e5a64442c9649689f347e2cc237ec3f41bf8 (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')
| -rw-r--r-- | lib/net/ftp.rb | 4 | ||||
| -rw-r--r-- | lib/net/protocol.rb | 2 | ||||
| -rw-r--r-- | lib/net/telnet.rb | 4 |
3 files changed, 5 insertions, 5 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) diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb index 0398e512e1..df38725cb9 100644 --- a/lib/net/protocol.rb +++ b/lib/net/protocol.rb @@ -395,7 +395,7 @@ module Net def connect( otime ) D "opening connection to #{@address}..." timeout( otime ) { - @socket = TCPsocket.new( @address, @port ) + @socket = TCPSocket.new( @address, @port ) } @rbuf = '' end diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index 91c4faedbe..62a8246d11 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -313,10 +313,10 @@ module Net begin if @options["Timeout"] == false - @sock = TCPsocket.open(@options["Host"], @options["Port"]) + @sock = TCPSocket.open(@options["Host"], @options["Port"]) else timeout(@options["Timeout"]) do - @sock = TCPsocket.open(@options["Host"], @options["Port"]) + @sock = TCPSocket.open(@options["Host"], @options["Port"]) end end rescue TimeoutError |