From: serassio <> Date: Wed, 22 Dec 2004 22:05:09 +0000 (+0000) Subject: bug# 1118: Squid sends requests to redirectors with shutdown flag on X-Git-Tag: SQUID_3_0_PRE4~951 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b902a58cb58daf4507d3d286f2338379fc20218a;p=thirdparty%2Fsquid.git bug# 1118: Squid sends requests to redirectors with shutdown flag on Incremental Patch --- diff --git a/src/helper.cc b/src/helper.cc index d9e068b500..7a60a3047b 100644 --- a/src/helper.cc +++ b/src/helper.cc @@ -1,6 +1,6 @@ /* - * $Id: helper.cc,v 1.62 2004/12/22 14:10:09 serassio Exp $ + * $Id: helper.cc,v 1.63 2004/12/22 15:05:09 serassio Exp $ * * DEBUG: section 84 Helper process maintenance * AUTHOR: Harvest Derived? @@ -383,7 +383,7 @@ helperStatefulDefer(statefulhelper * hlp) if (srv->flags.reserved == S_HELPER_RESERVED) continue; - if (!srv->flags.alive) + if (!srv->flags.shutdown) continue; if ((hlp->IsAvailable != NULL) && (srv->data != NULL) && @@ -571,7 +571,7 @@ helperStatefulStats(StoreEntry * sentry, statefulhelper * hlp) for (link = hlp->servers.head; link; link = link->next) { srv = (helper_stateful_server *)link->data; tt = 0.001 * tvSubMsec(srv->dispatch_time, current_time); - storeAppendPrintf(sentry, "%7d\t%7d\t%7d\t%11d\t%20d\t%%c%c%c%c%c\t%7.3f\t%7d\t%s\n", + storeAppendPrintf(sentry, "%7d\t%7d\t%7d\t%11d\t%20d\t%c%c%c%c%c\t%7.3f\t%7d\t%s\n", srv->index + 1, srv->rfd, srv->pid,