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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/03/07 19:39:09

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTOptions.ml 

Log message:
        patch #6451

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1363&r2=1.1364
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTOptions.ml?cvsroot=mldonkey&r1=1.35&r2=1.36

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1363
retrieving revision 1.1364
diff -u -b -r1.1363 -r1.1364
--- distrib/ChangeLog   2 Mar 2008 14:43:09 -0000       1.1363
+++ distrib/ChangeLog   7 Mar 2008 19:39:09 -0000       1.1364
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2008/03/07
+6451: BT: Implement minimum of 3 (like max_upload_slots)
+      for option max_bt_uploaders
+-------------------------------------------------------------------------------
 2008/03/02: version 2.9.4 = tag release-2-9-4
 6440: GTK2 GUI: Compile with lablgtk-2.10.1 by default
 - lablgtk-2.10.0 does not compile with Ocaml 3.10.2

Index: src/networks/bittorrent/bTOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/networks/bittorrent/bTOptions.ml        1 Jul 2007 21:58:08 -0000       
1.35
+++ src/networks/bittorrent/bTOptions.ml        7 Mar 2008 19:39:09 -0000       
1.36
@@ -90,7 +90,7 @@
 
 let max_bt_uploaders = define_option bittorrent_section ["max_bt_uploaders"]
   "Maximum number of uploaders for bittorrent"
-    int_option 5
+    int_option 3
 
 (* numwant: Optional. Number of peers that the client would like to receive 
from the tracker.
 This value is permitted to be zero. If omitted, typically defaults to 50 
peers.   *)
@@ -119,7 +119,7 @@
         if !!max_uploaders_per_torrent < 1 then max_uploaders_per_torrent =:= 
5);
     option_hook max_bt_uploaders
       (fun _ ->
-        if !!max_bt_uploaders < 0 then max_bt_uploaders =:= 5;
+        if !!max_bt_uploaders < 3 then max_bt_uploaders =:= 3;
        check_bt_uploaders ()
         );
     (* adds another hook to this common option here, to work around