[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/01 19:25:42

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml 
        src/daemon/driver: driverCommands.ml 
        src/networks/bittorrent: bTOptions.ml 
        src/networks/donkey: donkeyOptions.ml 

Log message:
        patch #4744

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.641&tr2=1.642&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.107&tr2=1.108&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.641 mldonkey/distrib/ChangeLog:1.642
--- mldonkey/distrib/ChangeLog:1.641    Sun Jan  1 19:21:18 2006
+++ mldonkey/distrib/ChangeLog  Sun Jan  1 19:25:42 2006
@@ -12,6 +12,8 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2006/01/01
+4744: Split client_timeout into ED2K-client_timeout and BT-client_timeout,
+      increase BT-client_timeout to 90 (tradie)
 4745: Update config.guess and config.sub to version 2005-12-23
 
 2005/12/28
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.111 
mldonkey/src/daemon/common/commonOptions.ml:1.112
--- mldonkey/src/daemon/common/commonOptions.ml:1.111   Wed Dec 28 21:37:39 2005
+++ mldonkey/src/daemon/common/commonOptions.ml Sun Jan  1 19:25:42 2006
@@ -1272,9 +1272,6 @@
     "The conversions to apply on Unicode characters"
     (list_option (tuple2_option (int_option, utf8_option))) []
 
-let client_timeout = define_expert_option current_section ["client_timeout"]
-  "Timeout on client connections when not queued" float_option 40.
-
 let interface_buffer = define_expert_option current_section 
["interface_buffer"]
   "The size of the buffer between the client and its GUI. Can be useful
 to increase when the connection between them has a small bandwith" int_option
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.107 
mldonkey/src/daemon/driver/driverCommands.ml:1.108
--- mldonkey/src/daemon/driver/driverCommands.ml:1.107  Wed Dec 28 10:36:26 2005
+++ mldonkey/src/daemon/driver/driverCommands.ml        Sun Jan  1 19:25:42 2006
@@ -1724,7 +1724,6 @@
                        strings_of_option save_options_delay;
                        strings_of_option update_gui_delay;
                        strings_of_option server_connection_timeout;
-                       strings_of_option client_timeout;
                        strings_of_option compaction_delay;
                        strings_of_option min_reask_delay;
                        strings_of_option buffer_writes;
Index: mldonkey/src/networks/bittorrent/bTOptions.ml
diff -u mldonkey/src/networks/bittorrent/bTOptions.ml:1.24 
mldonkey/src/networks/bittorrent/bTOptions.ml:1.25
--- mldonkey/src/networks/bittorrent/bTOptions.ml:1.24  Mon Nov  7 20:11:42 2005
+++ mldonkey/src/networks/bittorrent/bTOptions.ml       Sun Jan  1 19:25:42 2006
@@ -115,6 +115,9 @@
     "Minimum time in seconds to wait between asking the tracker for sources"
     int_option 300
 
+let client_timeout = define_option bittorrent_section ["client_timeout"]
+  "Timeout on client connections" float_option 90.
+
 let cookies = define_option bittorrent_section ["cookies"]
     "Cookies send with http request to get .torrent file"
     (list_option (tuple2_option (string_option, list_option (tuple2_option 
(string_option, string_option))))) []
Index: mldonkey/src/networks/donkey/donkeyOptions.ml
diff -u mldonkey/src/networks/donkey/donkeyOptions.ml:1.35 
mldonkey/src/networks/donkey/donkeyOptions.ml:1.36
--- mldonkey/src/networks/donkey/donkeyOptions.ml:1.35  Wed Dec 28 21:37:39 2005
+++ mldonkey/src/networks/donkey/donkeyOptions.ml       Sun Jan  1 19:25:42 2006
@@ -43,6 +43,9 @@
   define_expert_option donkey_section ["check_connections_delay"]
   "The delay between server connection rounds" float_option 5.0
 
+let client_timeout = define_expert_option donkey_section ["client_timeout"]
+  "Timeout on client connections when not queued" float_option 40.
+
 let max_connected_servers = define_option donkey_section
   ["max_connected_servers"]
     "The number of servers you want to stay connected to" int_option 3