[master] 0b46949 This cannot happen any more.
Poul-Henning Kamp
phk at FreeBSD.org
Tue Mar 17 08:58:18 CET 2015
commit 0b469498d4f0d8fc65ab6ae3f7e08d6655ae5b13
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Mar 17 07:58:04 2015 +0000
This cannot happen any more.
diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index c358e13..8160092 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -213,12 +213,8 @@ pool_accept(struct worker *wrk, void *arg)
while (1) {
INIT_OBJ(wa, WRK_ACCEPT_MAGIC);
- if (ps->lsock->sock < 0) {
- /* Socket Shutdown */
- FREE_OBJ(ps);
- WS_Release(wrk->aws, 0);
- return;
- }
+ assert(ps->lsock->sock > 0); // We know where stdin is
+
if (VCA_Accept(ps->lsock, wa) < 0) {
wrk->stats->sess_fail++;
/* We're going to pace in vca anyway... */
More information about the varnish-commit
mailing list