@@ -1,3 +1,7 @@

+Tue Mar 30 08:40:10 BST 2004 (trog)

+-----------------------------------

+  * clamav.conf, shared/cfgparser.c: recognise ReadTimeout option

+

 Mon Mar 29 18:11:08 CEST 2004 (tk)

 ----------------------------------

   * shared/output.c: don't try to unlock free mutex (bug reported

@@ -88,10 +88,9 @@ LocalSocket /tmp/clamd

 # You may need to increase threads number for a server machine.

 #MaxThreads 10

-# Thread (scanner - single task) will be stopped after this time (seconds).

-# Default is 180. Value of 0 disables the timeout. SECURITY HINT: Increase the

-# timeout instead of disabling it.

-#ThreadTimeout 500

+# Waiting for data from a client socket will timeout after this time (seconds).

+# Default is 120. Value of 0 disables the timeout.

+#ReadTimeout 300

 # Maximal depth the directories are scanned at.

 MaxDirectoryRecursion 15

@@ -80,7 +80,7 @@ struct cfgstruct *parsecfg(const char *cfgfile)

 	    {"StreamSaveToDisk", OPT_NOARG},

 	    {"StreamMaxLength", OPT_COMPSIZE},

 	    {"MaxThreads", OPT_NUM},

-	    {"ThreadTimeout", OPT_NUM},

+	    {"ReadTimeout", OPT_NUM},

 	    {"MaxDirectoryRecursion", OPT_NUM},

 	    {"FollowDirectorySymlinks", OPT_NOARG},

 	    {"FollowFileSymlinks", OPT_NOARG},