* 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: http://svn.ruby-lang.org/repos/ruby/trunk@2632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 1d8cbba55..75e087a20 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 0398e512e..df38725cb 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 91c4faedb..62a8246d1 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