[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/15 15:45:53

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyServers.ml 

Log message:
        patch #4797

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.675&tr2=1.676&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml.diff?tr1=1.49&tr2=1.50&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.675 mldonkey/distrib/ChangeLog:1.676
--- mldonkey/distrib/ChangeLog:1.675    Sat Jan 14 22:16:45 2006
+++ mldonkey/distrib/ChangeLog  Sun Jan 15 15:45:53 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/01/15
+4797: EDK: Always put server connect requests in connection queue
+
 2006/01/14
 4796: Windows: Log proper warning when MaxUserPort is reached (thx to Enig)
 4795: Mailer: Fix Subject encoding (bogeyman)
Index: mldonkey/src/networks/donkey/donkeyServers.ml
diff -u mldonkey/src/networks/donkey/donkeyServers.ml:1.49 
mldonkey/src/networks/donkey/donkeyServers.ml:1.50
--- mldonkey/src/networks/donkey/donkeyServers.ml:1.49  Thu Jan 12 09:03:11 2006
+++ mldonkey/src/networks/donkey/donkeyServers.ml       Sun Jan 15 15:45:53 2006
@@ -472,9 +472,8 @@
       ()
 
 let connect_server s =
-  if !!enable_servers && can_open_connection connection_manager
+  if !!enable_servers && not (Ip_set.ip_blocked s.server_ip)
     && (not !!connect_only_preferred_server || s.server_preferred)
-    && not (Ip_set.ip_blocked s.server_ip)
   then
     match s.server_sock with
     | NoConnection ->