[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/net/basicS...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       09/10/22 19:54:49

Modified files:
        distrib        : ChangeLog 
        src/utils/net  : basicSocket.ml 

Log message:
        patch #6958

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1397&r2=1.1398
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/basicSocket.ml?cvsroot=mldonkey&r1=1.32&r2=1.33

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1397
retrieving revision 1.1398
diff -u -b -r1.1397 -r1.1398
--- distrib/ChangeLog   22 Oct 2009 19:53:44 -0000      1.1397
+++ distrib/ChangeLog   22 Oct 2009 19:54:49 -0000      1.1398
@@ -15,6 +15,7 @@
 =========
 
 2009/10/22
+6958: EDK: Fix server connects on Solaris due to missing SO_KEEPALIVE
 6957: Configure: Make Ocaml 3.11.1 the default compiler
 6956; BT: Fix download of torrent files with no 'announce' field (Hose Bag)
 

Index: src/utils/net/basicSocket.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/basicSocket.ml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/utils/net/basicSocket.ml        19 Feb 2007 21:20:38 -0000      1.32
+++ src/utils/net/basicSocket.ml        22 Oct 2009 19:54:49 -0000      1.33
@@ -339,7 +339,7 @@
 
 let create name fd handler =
   MlUnix.set_nonblock fd;
-  if not Autoconf.windows then setsockopt fd SO_KEEPALIVE !socket_keepalive;
+  if not (Autoconf.windows || Autoconf.system="solaris") then setsockopt fd 
SO_KEEPALIVE !socket_keepalive;
   create_blocking name fd handler