@@ -15,6 +15,15 @@ To address this issue, the internal `cltypes.h` header has been replaced by

 a `clamav-types.h` that is generated on `./configure` and will be installed

 alongside `clamav.h`.

+Additional Changes:

+- Increased the default CommandReadTimeout to reduce the chance of mail loss

+  if using clamav-milter with the TCP socket. Contribution by Scott Kitterman.

+

+### Acknowledgements

+

+The ClamAV team thanks the following individuals for their code submissions:

+- Scott Kitterman

+

 ## 0.101.0

 ClamAV 0.101.0 is a feature release with an assortment of improvements that

@@ -171,11 +171,13 @@ Default: 120

 .TP

 \fBCommandReadTimeout NUMBER\fR

 This option specifies the time (in seconds) after which clamd should

-timeout if a client doesn't provide any initial command after connecting.

+timeout if a client doesn't provide any initial command after connecting.  The

+default is set to 30 to avoid timeouts with TCP sockets when processing large

+messages.  If using a Unix socket, the value can be changed to 5.

 Note: the timeout for subsequents commands, and/or data chunks is specified by

 ReadTimeout.

 .br

-Default: 5

+Default: 30

 .TP

 \fBSendBufTimeout NUMBER\fR

 This option specifies how long to wait (in milliseconds) if the send buffer is full.

@@ -145,8 +145,8 @@ Example

 # This option specifies the time (in seconds) after which clamd should

 # timeout if a client doesn't provide any initial command after connecting.

-# Default: 5

-#CommandReadTimeout 5

+# Default: 30

+#CommandReadTimeout 30

 # This option specifies how long to wait (in milliseconds) if the send buffer

 # is full.

@@ -247,7 +247,7 @@ const struct clam_option __clam_options[] = {

     { "ReadTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 120, NULL, 0, OPT_CLAMD, "This option specifies the time (in seconds) after which clamd should\ntimeout if a client doesn't provide any data.", "120" },

-    { "CommandReadTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 5, NULL, 0, OPT_CLAMD, "This option specifies the time (in seconds) after which clamd should\ntimeout if a client doesn't provide any initial command after connecting.", "5" },

+    { "CommandReadTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 30, NULL, 0, OPT_CLAMD, "This option specifies the time (in seconds) after which clamd should\ntimeout if a client doesn't provide any initial command after connecting.", "30" },

     { "SendBufTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 500, NULL, 0, OPT_CLAMD, "This option specifies how long to wait (in milliseconds) if the send buffer\nis full. Keep this value low to prevent clamd hanging.", "200"},