@@ -1,3 +1,8 @@

+Thu Jan 15 15:31:13 CET 2004 (tk)

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

+  * clamd: "ThreadTimeout 0" now properly disables the limit (thanks to

+	   Trog <trog*uncon.org>)

+

 Wed Jan 14 18:03:17 GMT 2004 (njh)

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

   * libclamav: added definition of binhexBegin

@@ -59,8 +59,10 @@ int procscan(const char *name, const struct cl_node *root, const struct cl_limit

 	case 0:

 	    if((cpt = cfgopt(copt, "ThreadTimeout")))

 	        alarm(cpt->numarg);

+/* 0 should disable the limit

 	    else

 	        alarm(CL_DEFAULT_SCANTIMEOUT);

+*/

 	    if(!name)

 		scanstream(odesc, NULL, root, limits, options, copt);

@@ -179,7 +179,7 @@ void *threadwatcher(void *arg)

 	    i = 0;

 	/* check time */

-        if(ths[i].active) /* races are harmless here (timeout is re-set) */

+        if(timeout && ths[i].active) /* races are harmless here (timeout is re-set) */

 	    if(time(NULL) - ths[i].start > timeout) {

 		pthread_cancel(ths[i].id);

 		mdprintf(ths[i].desc, "Session(%d): Time out ERROR\n", i);

@@ -290,7 +290,7 @@ void *threadwatcher(void *arg)

 		need_wait = 0;

 		for(j = 0; j < threads; j++)

 		    if(ths[j].active) {

-			if(time(NULL) - ths[j].start > timeout) {

+			if(timeout && (time(NULL) - ths[j].start > timeout)) {

 			    do_loop = 1;

 			    break;

 			} else need_wait = 1;