put hierarchy stuff into request structure

diff --git a/src/neighbors.cc b/src/neighbors.cc
index f4428c25ae51544e6c4553c51964832e49d7cb95..ee309711763b662953a370bdd8ae6f09c0459016 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: neighbors.cc,v 1.36 1996/07/25 07:10:38 wessels Exp $
+ * $Id: neighbors.cc,v 1.37 1996/07/26 16:58:46 wessels Exp $
  *
  * DEBUG: section 15    Neighbor Routines
  * AUTHOR: Harvest Derived
@@ -178,9 +178,9 @@ void hierarchy_log_append(entry, code, timeout, cache_host)
     if (code > HIER_MAX)
        code = HIER_MAX;
     if (mem)
-       mem->hierarchy_code = code;
+       mem->request->hierarchy_code = code;
     if (mem && cache_host)
-       mem->hierarchy_host = xstrdup(cache_host);
+       mem->request->hierarchy_host = xstrdup(cache_host);
 
     if (Config.commonLogFormat) {
        if (squid_curtime != last_time) {

diff --git a/src/url.cc b/src/url.cc
index 2c6d740aca6b781a7ebd5c893ba1592c5f66c72a..283e132fa6cf6795722bfcf9c77a21657d9f01f2 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: url.cc,v 1.25 1996/07/19 17:41:31 wessels Exp $
+ * $Id: url.cc,v 1.26 1996/07/26 16:58:33 wessels Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
@@ -278,8 +278,10 @@ void requestUnlink(request)
     if (request == NULL)
        return;
     request->link_count--;
-    if (request->link_count == 0)
-       put_free_request_t(request);
+    if (request->link_count) 
+       return;
+    safe_free(request->hierarchy_host);
+    put_free_request_t(request);
 }
 
 int matchDomainName(domain, host)