@@ -438,6 +438,10 @@ int main(int argc, char **argv)

             cl_engine_set_num(engine, CL_ENGINE_DISABLE_PE_STATS, 1);

         }

+        if (optget(opts, "StatsTimeout")->enabled) {

+            cl_engine_set_num(engine, CL_ENGINE_STATS_TIMEOUT, optget(opts, "StatsTimeout")->numarg);

+        }

+

         if (optget(opts, "StatsHostID")->enabled) {

             char *p = optget(opts, "StatsHostID")->strarg;

@@ -582,6 +582,10 @@ int scanmanager(const struct optstruct *opts)

         cl_engine_set_clcb_stats_add_sample(engine, NULL);

     }

+    if (optget(opts, "stats-timeout")->enabled) {

+        cl_engine_set_num(engine, CL_ENGINE_STATS_TIMEOUT, optget(opts, "StatsTimeout")->numarg);

+    }

+

     if (optget(opts, "stats-host-id")->enabled) {

         char *p = optget(opts, "stats-host-id")->strarg;

@@ -763,6 +763,10 @@ void submit_host_info(struct optstruct *opts)

     else if (strcmp(hostid, "default"))

         cl_engine_set_clcb_stats_get_hostid(engine, get_hostid);

+    if (optget(opts, "stats-timeout")->enabled) {

+        cl_engine_set_num(engine, CL_ENGINE_STATS_TIMEOUT, optget(opts, "StatsTimeout")->numarg);

+    }

+

     cl_engine_free(engine);

 }

@@ -204,7 +204,8 @@ enum cl_engine_field {

     CL_ENGINE_MAX_ZIPTYPERCG,       /* uint64_t */

     CL_ENGINE_FORCETODISK,          /* uint32_t */

     CL_ENGINE_DISABLE_CACHE,        /* uint32_t */

-    CL_ENGINE_DISABLE_PE_STATS      /* uint32_t */

+    CL_ENGINE_DISABLE_PE_STATS,     /* uint32_t */

+    CL_ENGINE_STATS_TIMEOUT         /* uint32_t */

 };

 enum bytecode_security {

@@ -400,6 +400,7 @@ struct cl_engine *cl_engine_new(void)

     intel->engine = new;

     intel->maxsamples = STATS_MAX_SAMPLES;

     intel->maxmem = STATS_MAX_MEM;

+    intel->timeout = 10;

     new->stats_data = intel;

     new->cb_stats_add_sample = clamav_stats_add_sample;

     new->cb_stats_submit = clamav_stats_submit;

@@ -542,6 +543,12 @@ int cl_engine_set_num(struct cl_engine *engine, enum cl_engine_field field, long

             engine->engine_options &= ~(ENGINE_OPTIONS_DISABLE_PE_STATS);

         }

         break;

+    case CL_ENGINE_STATS_TIMEOUT:

+        if ((engine->stats_data)) {

+            cli_intel_t *intel = (cli_intel_t *)(engine->stats_data);

+

+            intel->timeout = (uint32_t)num;

+        }

 	default:

 	    cli_errmsg("cl_engine_set_num: Incorrect field number\n");

 	    return CL_EARG;

@@ -164,6 +164,7 @@ typedef struct cli_clamav_intel {

     uint32_t nsamples;

     uint32_t maxsamples;

     uint32_t maxmem;

+    uint32_t timeout;

     time_t nextupdate;

     struct cl_engine *engine;

 #ifdef CL_THREAD_SAFE

@@ -353,7 +353,7 @@ void clamav_stats_submit(struct cl_engine *engine, void *cbdata)

     }

     if (json) {

-        submit_post(STATS_HOST, STATS_PORT, "PUT", "/clamav/1/submit/stats", json);

+        submit_post(STATS_HOST, STATS_PORT, "PUT", "/clamav/1/submit/stats", json, myintel.timeout);

         free(json);

     }

@@ -24,7 +24,7 @@

 #include "libclamav/clamav.h"

 #include "libclamav/www.h"

-int connect_host(const char *host, const char *port, int useAsync)

+int connect_host(const char *host, const char *port, uint32_t timeout, int useAsync)

 {

     int sockfd;

     struct addrinfo hints, *servinfo, *p;

@@ -67,7 +67,7 @@ int connect_host(const char *host, const char *port, int useAsync)

                 FD_SET(sockfd, &write_fds);

                 /* TODO: Make this timeout configurable */

-                tv.tv_sec = 10;

+                tv.tv_sec = timeout;

                 tv.tv_usec = 0;

                 if (select(sockfd + 1, &read_fds, &write_fds, NULL, &tv) <= 0) {

                     close(sockfd);

@@ -150,7 +150,7 @@ char *encode_data(const char *postdata)

     return buf;

 }

-void submit_post(const char *host, const char *port, const char *method, const char *url, const char *postdata)

+void submit_post(const char *host, const char *port, const char *method, const char *url, const char *postdata, uint32_t timeout)

 {

     int sockfd, n;

     unsigned int i;

@@ -214,7 +214,7 @@ void submit_post(const char *host, const char *port, const char *method, const c

         free(encoded);

     }

-    sockfd = connect_host(host, port, 1);

+    sockfd = connect_host(host, port, timeout, 1);

     if (sockfd < 0) {

         free(buf);

         return;

@@ -235,7 +235,7 @@ void submit_post(const char *host, const char *port, const char *method, const c

          * while it's being processed). Give a ten-second timeout so we don't have a major

          * impact on scanning.

          */

-        tv.tv_sec = 10;

+        tv.tv_sec = timeout;

         tv.tv_usec = 0;

         if ((n = select(sockfd+1, &readfds, NULL, NULL, &tv)) <= 0)

             break;

@@ -1,9 +1,9 @@

 #if !defined(_LIBCLAMAV_WWW_H)

 #define _LIBCLAMAV_WWW_H

-int connect_host(const char *host, const char *port, int useAsync);

+int connect_host(const char *host, const char *port, uint32_t timeout, int useAsync);

 size_t encoded_size(const char *postdata);

 char *encode_data(const char *postdata);

-void submit_post(const char *host, const char *port, const char *method, const char *url, const char *postdata);

+void submit_post(const char *host, const char *port, const char *method, const char *url, const char *postdata, uint32_t timeout);

 #endif

@@ -186,6 +186,8 @@ const struct clam_option __clam_options[] = {

     { "StatsPEDisabled", "disable-pe-stats", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Disable submission of PE section statistical data", "no" },

+    { "StatsTimeout", "stats-timeout", 0, TYPE_NUMBER, MATCH_NUMBER, -1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN | OPT_FRESHCLAM, "Timeout in seconds to timeout communication with the stats server.", "10" },

+

     { "LogFileUnlock", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_MILTER, "By default the log file is locked for writing and only a single\ndaemon process can write to it. This option disables the lock.", "yes" },

     { "LogFileMaxSize", NULL, 0, TYPE_SIZE, MATCH_SIZE, 1048576, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Maximum size of the log file.\nValue of 0 disables the limit.", "5M" },