Merge jv
authorMerge Script
Wed, 25 Nov 2015 07:04:02 +0100
branchjv
changeset 3656 bf2395abae60
parent 3654 2e07929bffcc (current diff)
parent 3655 eb81fa3d8407 (diff)
child 3658 5cc1c8220666
Merge
Socket.st
--- a/Socket.st	Fri Nov 20 06:48:41 2015 +0100
+++ b/Socket.st	Wed Nov 25 07:04:02 2015 +0100
@@ -2047,6 +2047,7 @@
 !
 
 connectTo:hostOrPathName port:portNrOrName
+    <resource: #obsolete>
     "Backward compatibility connect; connect to port, portNrOrNameOrNil on host, hostOrPathNameOrSocketAddr.
      For backward compatibility, hostOrPathNameOrSocketAddr may be also a string or a byteArray,
      but it is recommended to pass SocketAddress instances.
@@ -2059,6 +2060,7 @@
 !
 
 connectTo:hostOrPathNameOrSocketAddr port:portNrOrNameOrNil withTimeout:timeout
+    <resource: #obsolete>
     "Backward compatibility connect; connect to port, portNrOrNameOrNil on host, hostOrPathNameOrSocketAddr.
      For backward compatibility, hostOrPathNameOrSocketAddr may be also a string or a byteArray,
      but it is recommended to pass SocketAddress instances.
@@ -3798,6 +3800,7 @@
     "
 ! !
 
+
 !Socket methodsFor:'specials'!
 
 linger:anIntegerOrNil
@@ -4073,6 +4076,7 @@
     ^ self setSocketOption:#'TCP_NODELAY' argument:aBoolean argument:nil.
 ! !
 
+
 !Socket methodsFor:'waiting'!
 
 waitForNewConnectionOrDataOnAny:otherConnections timeout:timeoutSeconds