Browse code

freshclam: change default of ReceiveTimeout to 0

This fixes issues in cvd download when network speed is slow.
Setting is passed to libcurl CURLOPT_TIMEOUT. Original default of 60s
was not enough if network speed is limited. Curl handles this as
total time for http(s) transfer.

https://curl.haxx.se/libcurl/c/CURLOPT_TIMEOUT.html

Also change commented out setting of ReceiveTimeout on example configs
to somewhat sensible value (1800s).

Signed-off-by: Tuomo Soini <tis@foobar.fi>

Tuomo Soini authored on 2020/01/29 01:12:15
Showing 4 changed files
... ...
@@ -199,9 +199,9 @@ Timeout in seconds when connecting to database server.
199 199
 Default: 10
200 200
 .TP
201 201
 \fBReceiveTimeout NUMBER\fR
202
-Timeout in seconds when reading from database server.
202
+Timeout in seconds when reading from database server. 0 means no timeout.
203 203
 .br
204
-Default: 60
204
+Default: 0
205 205
 .TP
206 206
 \fBSafeBrowsing BOOL\fR
207 207
 This option enables support for Google Safe Browsing. When activated for the first time, freshclam will download a new database file (safebrowsing.cvd) which will be automatically loaded by clamd and clamscan during the next reload, provided that the heuristic phishing detection is turned on. This database includes information about websites that may be phishing sites or possible sources of malware. When using this option, it's mandatory to run freshclam at least every 30 minutes. Freshclam uses the ClamAV's mirror infrastructure to distribute the database and its updates but all the contents are provided under Google's terms of use. See https://support.google.com/code/answer/70015 and https://www.clamav.net/documents/safebrowsing for more information.
... ...
@@ -170,8 +170,8 @@ DatabaseMirror database.clamav.net
170 170
 #ConnectTimeout 60
171 171
 
172 172
 # Timeout in seconds when reading from database server.
173
-# Default: 60
174
-#ReceiveTimeout 300
173
+# Default: 0
174
+#ReceiveTimeout 1800
175 175
 
176 176
 # With this option enabled, freshclam will attempt to load new
177 177
 # databases into memory to make sure they are properly handled
... ...
@@ -496,7 +496,7 @@ const struct clam_option __clam_options[] = {
496 496
 
497 497
     {"ConnectTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 30, NULL, 0, OPT_FRESHCLAM, "Timeout in seconds when connecting to database server.", "30"},
498 498
 
499
-    {"ReceiveTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 60, NULL, 0, OPT_FRESHCLAM, "Timeout in seconds when reading from database server.", "60"},
499
+    {"ReceiveTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 0, NULL, 0, OPT_FRESHCLAM, "Timeout in seconds when reading from database server.", "0"},
500 500
 
501 501
     {"SafeBrowsing", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM, "This option enables support for Google Safe Browsing. When activated for\nthe first time, freshclam will download a new database file (safebrowsing.cvd)\nwhich will be automatically loaded by clamd and clamscan during the next\nreload, provided that the heuristic phishing detection is turned on. This\ndatabase includes information about websites that may be phishing sites or\npossible sources of malware. When using this option, it's mandatory to run\nfreshclam at least every 30 minutes.\nFreshclam uses the ClamAV's mirror infrastructure to distribute the\ndatabase and its updates but all the contents are provided under Google's\nterms of use. See https://transparencyreport.google.com/safe-browsing/overview \n and https://www.clamav.net/documents/safebrowsing for more information.", "yes"},
502 502
 
... ...
@@ -170,8 +170,8 @@ DatabaseMirror database.clamav.net
170 170
 #ConnectTimeout 60
171 171
 
172 172
 # Timeout in seconds when reading from database server.
173
-# Default: 60
174
-#ReceiveTimeout 300
173
+# Default: 0
174
+#ReceiveTimeout 1800
175 175
 
176 176
 # With this option enabled, freshclam will attempt to load new
177 177
 # databases into memory to make sure they are properly handled