- changed debug level of purgelru results

- do callbacks for helpers which are unexpectedly closed

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 874c06007df6ac4a66c5b64e3f6ebcef32096f57..c2c857541fc2d1e615cc2ffb34bbcb643786c7ea 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,7 +1,7 @@
 
 
 /*
- * $Id: fqdncache.cc,v 1.124 1998/11/20 05:16:27 wessels Exp $
+ * $Id: fqdncache.cc,v 1.125 1998/11/20 06:13:15 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -151,7 +151,7 @@ fqdncache_purgelru(void *notused)
        fqdncache_release(f);
        removed++;
     }
-    debug(35, 3) ("fqdncache_purgelru: removed %d entries\n", removed);
+    debug(35, 9) ("fqdncache_purgelru: removed %d entries\n", removed);
 }
 
 /* create blank fqdncache_entry */

diff --git a/src/helper.cc b/src/helper.cc
index cbb4b6aa8deff7de3a26cea605c455469d1e6f00..624c026a8a17cd12470dd62063c0d91aa2dc67e6 100644 (file)
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -209,11 +209,17 @@ helperServerFree(int fd, void *data)
 {
     helper_server *srv = data;
     helper *hlp = srv->parent;
+    helper_request *r;
     assert(srv->rfd == fd);
     if (srv->buf) {
        memFree(MEM_8K_BUF, srv->buf);
        srv->buf = NULL;
     }
+    if ((r = srv->request)) {
+       if (cbdataValid(r->data))
+           r->callback(r->data, srv->buf);
+       helperRequestFree(r);
+    }
     if (srv->wfd != srv->rfd)
        comm_close(srv->wfd);
     dlinkDelete(&srv->link, &hlp->servers);
@@ -262,6 +268,8 @@ helperHandleRead(int fd, void *data)
     } else if ((t = strchr(srv->buf, '\n'))) {
        /* end of reply found */
        debug(29, 3) ("helperHandleRead: end of reply found\n");
+debug(0, 0) ("helperHandleRead: r->callback=%p, r->data=%p, valid=%d\n",
+       r->callback, r->data, cbdataValid(r->data));
        *t = '\0';
        if (cbdataValid(r->data))
            r->callback(r->data, srv->buf);

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 7876f7c6b41a63b969c86107b49b8288ba6ff847..8f13beef79a73e51454a4122729f5b63279cc52b 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.208 1998/11/20 05:16:29 wessels Exp $
+ * $Id: ipcache.cc,v 1.209 1998/11/20 06:13:15 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -175,7 +175,7 @@ ipcache_purgelru(void *voidnotused)
        ipcache_release(i);
        removed++;
     }
-    debug(14, 3) ("ipcache_purgelru: removed %d entries\n", removed);
+    debug(14, 9) ("ipcache_purgelru: removed %d entries\n", removed);
 }
 
 /* create blank ipcache_entry */
@@ -270,6 +270,7 @@ ipcacheParse(const char *inbuf)
     i.status = IP_NEGATIVE_CACHED;
     if (inbuf == NULL) {
        debug(14, 1) ("ipcacheParse: Got <NULL> reply\n");
+       i.error_message = xstrdup("Internal Squid Error");
        return &i;
     }
     xstrncpy(buf, inbuf, DNS_INBUF_SZ);