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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/03/27 19:33:11

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

Log message:
        patch #7142

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1415&r2=1.1416
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTOptions.ml?cvsroot=mldonkey&r1=1.40&r2=1.41

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1415
retrieving revision 1.1416
diff -u -b -r1.1415 -r1.1416
--- distrib/ChangeLog   27 Mar 2010 16:18:17 -0000      1.1415
+++ distrib/ChangeLog   27 Mar 2010 19:33:10 -0000      1.1416
@@ -15,6 +15,7 @@
 =========
 
 2010/03/27
+7142: BT: max_uploaders_per_torrent option not restored from .ini files (xboct)
 7140: MinGW: Fix linking with Ocaml 3.11.2
 7139: BT: Some improvements and fixes (ygrek)
 - Don't request sources from tracker (set numwant=0) if we don't need them e.g.

Index: src/networks/bittorrent/bTOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- src/networks/bittorrent/bTOptions.ml        4 Jan 2009 14:46:46 -0000       
1.40
+++ src/networks/bittorrent/bTOptions.ml        27 Mar 2010 19:33:10 -0000      
1.41
@@ -84,14 +84,14 @@
   "Send client key to trackers"
     bool_option true
 
-let max_uploaders_per_torrent = define_option bittorrent_section 
["max_uploaders_per_torrent"]
-  "Maximum number of uploaders for one torrent, can not be higher than 
max_bt_uploaders"
-    int_option 3
-
 let max_bt_uploaders = define_option bittorrent_section ["max_bt_uploaders"]
   "Maximum number of uploaders for bittorrent, can not be higher than 
max_upload_slots"
     int_option 3
 
+let max_uploaders_per_torrent = define_option bittorrent_section 
["max_uploaders_per_torrent"]
+  "Maximum number of uploaders for one torrent, can not be higher than 
max_bt_uploaders"
+    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.   *)