]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
relocate all-redirectors-have-exited check.
authorwessels <>
Tue, 15 Sep 1998 12:49:58 +0000 (12:49 +0000)
committerwessels <>
Tue, 15 Sep 1998 12:49:58 +0000 (12:49 +0000)
removed NRedirectorsOpen == 0 assertion

src/redirect.cc

index 6f72cf7a0fdeb7ba8d6354a504bed74606424c1f..3ed5953bd7ead7afd9f9b8a5b100683c7a96c694 100644 (file)
@@ -1,6 +1,6 @@
 
 /*
- * $Id: redirect.cc,v 1.69 1998/09/15 06:38:28 wessels Exp $
+ * $Id: redirect.cc,v 1.70 1998/09/15 06:49:58 wessels Exp $
  *
  * DEBUG: section 29    Redirector
  * AUTHOR: Duane Wessels
@@ -115,8 +115,6 @@ redirectHandleRead(int fd, void *data)
        memFree(MEM_8K_BUF, redirector->inbuf);
        redirector->inbuf = NULL;
        comm_close(fd);
-       if (--NRedirectorsOpen == 0 && !shutting_down)
-           fatal_dump("All redirectors have exited!");
        return;
     }
     if (len != 1)
@@ -304,6 +302,9 @@ redirectorStateFree(int fd, void *data)
     }
     dlinkDelete(&r->link, &redirectors);
     cbdataFree(r);
+    NRedirectorsOpen--;
+    if (NRedirectorsOpen == 0 && !shutting_down)
+       fatal_dump("All redirectors have exited!");
 }
 
 void
@@ -326,7 +327,6 @@ redirectOpenServers(void)
     }
     assert(redirectors.head == NULL);
     assert(redirectors.tail == NULL);
-    assert(NRedirectorsOpen == 0);
     if (Config.Program.redirect == NULL)
        return;
     NRedirectors = Config.redirectChildren;