From: wessels <>
Date: Sun, 14 Apr 1996 08:39:15 +0000 (+0000)
Subject: bugfix: setting flag to 0 caused KEY_URL to get cleared after setting key
X-Git-Tag: SQUID_3_0_PRE1~6192
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9a988f11c53576583593cb90b00a1a0778e37bd;p=thirdparty%2Fsquid.git

bugfix: setting flag to 0 caused KEY_URL to get cleared after setting key
---

diff --git a/src/store.cc b/src/store.cc
index fe43e27a85..10c628b0c3 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
-/* $Id: store.cc,v 1.49 1996/04/12 21:41:42 wessels Exp $ */
-#ident "$Id: store.cc,v 1.49 1996/04/12 21:41:42 wessels Exp $"
+/* $Id: store.cc,v 1.50 1996/04/14 02:39:15 wessels Exp $ */
+#ident "$Id: store.cc,v 1.50 1996/04/14 02:39:15 wessels Exp $"
 
 /*
  * DEBUG: Section 20          store
@@ -276,15 +276,12 @@ void storeFreeEntry(e)
     if (has_mem_obj(e)) {
 	safe_free(e->mem_obj->mime_hdr);
 	/* Leave an unzeroed pointer to the abort msg for posterity */
-	if (e->mem_obj->e_abort_msg)
-	    free(e->mem_obj->e_abort_msg);
+	safe_free(e->mem_obj->e_abort_msg);
 	safe_free(e->mem_obj->pending);
 	/* look up to free client_list */
 	if (e->mem_obj->client_list) {
-	    for (i = 0; i < e->mem_obj->client_list_size; ++i) {
-		if (e->mem_obj->client_list[i])
+	    for (i = 0; i < e->mem_obj->client_list_size; ++i)
 		    safe_free(e->mem_obj->client_list[i]);
-	    }
 	    safe_free(e->mem_obj->client_list);
 	}
     }
@@ -686,7 +683,6 @@ StoreEntry *storeAddDiskRestore(url, file_number, size, expires, timestamp)
     BIT_RESET(e->flag, ENTRY_PRIVATE);
     e->method = METHOD_GET;
     storeSetPublicKey(e);
-    e->flag = 0;
     BIT_SET(e->flag, CACHABLE);
     BIT_RESET(e->flag, RELEASE_REQUEST);
     BIT_SET(e->flag, ENTRY_HTML);