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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/08/04 19:33:07

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

Log message:
        patch #6599

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1379&r2=1.1380
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTOptions.ml?cvsroot=mldonkey&r1=1.38&r2=1.39

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1379
retrieving revision 1.1380
diff -u -b -r1.1379 -r1.1380
--- distrib/ChangeLog   29 Jul 2008 17:26:38 -0000      1.1379
+++ distrib/ChangeLog   4 Aug 2008 19:33:06 -0000       1.1380
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2008/08/04
+6599: Allow values lower than max_upload_slots for BT-max_bt_uploaders
+
 2008/07/29
 6593: CryptoPP performance fix for ARM (Marc Pignat)
 6592: HTML: Fix invalid html respond when login is invalid

Index: src/networks/bittorrent/bTOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/networks/bittorrent/bTOptions.ml        31 Mar 2008 07:54:17 -0000      
1.38
+++ src/networks/bittorrent/bTOptions.ml        4 Aug 2008 19:33:06 -0000       
1.39
@@ -116,11 +116,13 @@
   begin
     option_hook max_uploaders_per_torrent
       (fun _ ->
-        if !!max_uploaders_per_torrent < 1 then max_uploaders_per_torrent =:= 
5);
+        let v = int_of_string (strings_of_option 
max_uploaders_per_torrent).option_default in
+        if !!max_uploaders_per_torrent < 1 then max_uploaders_per_torrent =:= 
v);
     option_hook max_bt_uploaders
       (fun _ ->
-        let v = int_of_string (strings_of_option 
max_upload_slots).option_default in
-        if !!max_bt_uploaders < v then max_bt_uploaders =:= v;
+        let v1 = int_of_string (strings_of_option 
max_upload_slots).option_default in
+        let v2 = int_of_string (strings_of_option 
max_bt_uploaders).option_default in
+        if !!max_bt_uploaders < 1 || !!max_bt_uploaders > v1 then 
max_bt_uploaders =:= v2;
        check_bt_uploaders ()
         );
     option_hook max_tracker_redirect   (** #4541 [egs] **)