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

+Sun Oct 29 19:45:07 CET 2006 (tk)

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

+  * clamd: change stack size at the right place (closes bug#103)

+	   Patch from Jonathan Chen <jon+clamav*spock.org>

+

 Sun Oct 29 19:28:20 CET 2006 (tk)

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

   * configure: make user/group check more precise (closes bug#41)

@@ -255,7 +255,6 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_node *root, unsigned in

 #endif

 	mode_t old_umask;

 	struct cl_limits limits;

-	pthread_attr_t thattr;

 #ifndef	C_WINDOWS

 	sigset_t sigset;

 #endif

@@ -424,9 +423,6 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_node *root, unsigned in

 	logg("Self checking every %d seconds.\n", selfchk);

     }

-    pthread_attr_init(&thattr);

-    pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);

-

     if(cfgopt(copt, "ClamukoScanOnAccess")->enabled)

 #ifdef CLAMUKO

     {

@@ -476,18 +472,6 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_node *root, unsigned in

     }

 #endif

-#if defined(C_BIGSTACK) || defined(C_BSD)

-    /*

-     * njh@bandsman.co.uk:

-     * libclamav/scanners.c uses a *huge* buffer

-     * (128K not BUFSIZ from stdio.h).

-     * We need to allow for that.

-     */

-    pthread_attr_getstacksize(&thattr, &stacksize);

-    logg("*set stacksize to %u\n", stacksize + SCANBUFF + 64 * 1024);

-    pthread_attr_setstacksize(&thattr, stacksize + SCANBUFF + 64 * 1024);

-#endif

-

     pthread_mutex_init(&exit_mutex, NULL);

     pthread_mutex_init(&reload_mutex, NULL);

@@ -134,6 +134,9 @@ void thrmgr_destroy(threadpool_t *threadpool)

 threadpool_t *thrmgr_new(int max_threads, int idle_timeout, void (*handler)(void *))

 {

 	threadpool_t *threadpool;

+#if defined(C_BIGSTACK) || defined(C_BSD)

+	size_t stacksize;

+#endif

 	if (max_threads <= 0) {

 		return NULL;

@@ -179,6 +182,14 @@ threadpool_t *thrmgr_new(int max_threads, int idle_timeout, void (*handler)(void

 		free(threadpool);

 		return NULL;

 	}

+

+#if defined(C_BIGSTACK) || defined(C_BSD)

+	pthread_attr_getstacksize(&(threadpool->pool_attr), &stacksize);

+	stacksize = stacksize + 64 * 1024;

+	if (stacksize < 1048576) stacksize = 1048576; /* at least 1MB please */

+	logg("Set stacksize to %u\n", stacksize);

+	pthread_attr_setstacksize(&(threadpool->pool_attr), stacksize);

+#endif

 	threadpool->state = POOL_VALID;

 	return threadpool;