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 fe43e27a85c36511815a9d31f132768f9389b5e8..10c628b0c30dd5e22421935116c069dbfe2819c1 100644 (file)
--- 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);