From 388920bc53a01d983cd438d8ee1f1518f92097ce Mon Sep 17 00:00:00 2001 From: Robert James Kaes Date: Tue, 8 Jan 2002 02:02:25 +0000 Subject: Added code which checks to see if the user has signalled that tinyproxy should be closed. --- ChangeLog | 5 +++++ src/thread.c | 21 +++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b3d2ac..4f97d40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-01-07 Robert James Kaes + + * src/thread.c (thread_main): Added code to check if tinyproxy is + being killed by the user. + 2001-12-28 Robert James Kaes * src/thread.c (thread_main): Added code to detect errors in the diff --git a/src/thread.c b/src/thread.c index 4ea1bbf..4afd0af 100644 --- a/src/thread.c +++ b/src/thread.c @@ -1,4 +1,4 @@ -/* $Id: thread.c,v 1.19 2001-12-28 22:29:11 rjkaes Exp $ +/* $Id: thread.c,v 1.20 2002-01-08 02:02:25 rjkaes Exp $ * * Handles the creation/destruction of the various threads required for * processing incoming connections. @@ -26,7 +26,7 @@ /* * This is the stack frame size used by all the threads. We'll start by - * setting it to 128 KB. + * setting it to 32 KB. */ #define THREAD_STACK_SIZE (1024 * 32) @@ -128,6 +128,15 @@ thread_main(void *arg) clilen = addrlen; pthread_mutex_lock(&mlock); + + /* + * Check to see if the program is shutting down. + */ + if (config.quit) { + pthread_mutex_unlock(&mlock); + break; + } + connfd = accept(listenfd, cliaddr, &clilen); pthread_mutex_unlock(&mlock); @@ -139,7 +148,6 @@ thread_main(void *arg) continue; } - ptr->status = T_CONNECTED; SERVER_DEC(); @@ -160,9 +168,7 @@ thread_main(void *arg) ptr->status = T_EMPTY; - safefree(cliaddr); - - return NULL; + break; } } @@ -179,8 +185,7 @@ thread_main(void *arg) ptr->status = T_EMPTY; - safefree(cliaddr); - return NULL; + break; } SERVER_UNLOCK(); -- cgit v1.2.3