---------------------
PatchSet 2806 
Date: 2001/08/22 10:43:12
Author: rbcollins
Branch: ntlm
Tag: (none) 
Log:
Fix early death of NTLM helpers on rotate/reconfigure

Members: 
	src/helper.c:1.1.1.3.12.39->1.1.1.3.12.40 

Index: squid/src/helper.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/helper.c,v
retrieving revision 1.1.1.3.12.39
retrieving revision 1.1.1.3.12.40
diff -u -r1.1.1.3.12.39 -r1.1.1.3.12.40
--- squid/src/helper.c	13 Aug 2001 23:53:08 -0000	1.1.1.3.12.39
+++ squid/src/helper.c	22 Aug 2001 10:43:12 -0000	1.1.1.3.12.40
@@ -1,6 +1,6 @@
 
 /*
- * $Id: helper.c,v 1.1.1.3.12.39 2001/08/13 23:53:08 rbcollins Exp $
+ * $Id: helper.c,v 1.1.1.3.12.40 2001/08/22 10:43:12 rbcollins Exp $
  *
  * DEBUG: section 29    Helper process maintenance
  * AUTHOR: Harvest Derived?
@@ -825,7 +825,9 @@
 	    intAverage(hlp->stats.avg_svc_time,
 	    tvSubMsec(srv->dispatch_time, current_time),
 	    hlp->stats.replies, REDIRECT_AV_FACTOR);
-	if (srv->flags.shutdown) {
+	if (srv->flags.shutdown 
+	    && srv->flags.reserved == S_HELPER_FREE 
+	    && !srv->deferred_requests) {
 	    comm_close(srv->wfd);
 	    srv->wfd = -1;
 	} else {
@@ -1037,7 +1039,9 @@
 	/* and push the queue. Note that the callback may have submitted a new 
 	 * request to the helper which is why we test for the request*/
 	if (srv->request == NULL) {
-	    if (srv->flags.shutdown) {
+	    if (srv->flags.shutdown
+		&& srv->flags.reserved == S_HELPER_FREE 
+		&& !srv->deferred_requests) {
 		comm_close(srv->wfd);
 		srv->wfd = -1;
 	    } else {