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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/03/31 07:54:17

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

Log message:
        patch #6470

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1367&r2=1.1368
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTOptions.ml?cvsroot=mldonkey&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOptions.ml?cvsroot=mldonkey&r1=1.66&r2=1.67

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1367
retrieving revision 1.1368
diff -u -b -r1.1367 -r1.1368
--- distrib/ChangeLog   18 Mar 2008 08:24:37 -0000      1.1367
+++ distrib/ChangeLog   31 Mar 2008 07:54:17 -0000      1.1368
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2008/03/31
+6470: BT: Use default of max_upload_slots as minimum for BT-max_bt_uploaders
+      instead of hard-coded value
+
 2008/03/18
 6466: Fix option_hook loop when changing max_upload_slots < 3,
       caused by patch #6451

Index: src/networks/bittorrent/bTOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- src/networks/bittorrent/bTOptions.ml        18 Mar 2008 08:24:38 -0000      
1.37
+++ src/networks/bittorrent/bTOptions.ml        31 Mar 2008 07:54:17 -0000      
1.38
@@ -119,7 +119,8 @@
         if !!max_uploaders_per_torrent < 1 then max_uploaders_per_torrent =:= 
5);
     option_hook max_bt_uploaders
       (fun _ ->
-        if !!max_bt_uploaders < 3 then max_bt_uploaders =:= 3;
+        let v = int_of_string (strings_of_option 
max_upload_slots).option_default in
+        if !!max_bt_uploaders < v then max_bt_uploaders =:= v;
        check_bt_uploaders ()
         );
     option_hook max_tracker_redirect   (** #4541 [egs] **)

Index: src/networks/donkey/donkeyOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- src/networks/donkey/donkeyOptions.ml        31 Aug 2007 19:41:42 -0000      
1.66
+++ src/networks/donkey/donkeyOptions.ml        31 Mar 2008 07:54:17 -0000      
1.67
@@ -47,7 +47,7 @@
     int_option 3
 
 let max_allowed_connected_servers () =
-  min (int_of_string ((strings_of_option 
max_connected_servers).option_default))
+  min (int_of_string (strings_of_option max_connected_servers).option_default)
       !!max_connected_servers
 
 let reliable_sources = define_option donkey_section ["reliable_sources"]