From c10dadc76e421de6ddbafb48fa4d7187acef46db Mon Sep 17 00:00:00 2001
From: spiralvoice <spiralvoice>
Date: Mon, 4 Aug 2008 19:33:06 +0000
Subject: [PATCH] patch #6599

---
 distrib/ChangeLog                    | 3 +++
 src/networks/bittorrent/bTOptions.ml | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/distrib/ChangeLog b/distrib/ChangeLog
index 052b7ded..f7159eed 100644
--- a/distrib/ChangeLog
+++ b/distrib/ChangeLog
@@ -14,6 +14,9 @@ http://mldonkey.sourceforge.net/Windows#MinGW_Installation
 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
diff --git a/src/networks/bittorrent/bTOptions.ml b/src/networks/bittorrent/bTOptions.ml
index d407db7a..7929fa40 100644
--- a/src/networks/bittorrent/bTOptions.ml
+++ b/src/networks/bittorrent/bTOptions.ml
@@ -116,11 +116,13 @@ let _ =
   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] **)
-- 
2.11.4.GIT