EBIT bugfix. Was passing REQ_CACHABLE enum as a bitfield.

diff --git a/src/mime.cc b/src/mime.cc
index a55df6a6466db50111244a279411bc99e94fae4a..edddb3c6f1ce2e3c6360a5dd13d82cab9e4da8dd 100644 (file)
--- a/src/mime.cc
+++ b/src/mime.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: mime.cc,v 1.43 1997/11/12 00:08:56 wessels Exp $
+ * $Id: mime.cc,v 1.44 1997/11/14 05:13:29 wessels Exp $
  *
  * DEBUG: section 25    MIME Parsing
  * AUTHOR: Harvest Derived
@@ -392,6 +392,7 @@ mimeLoadIconFile(const char *icon)
     int fd;
     int n;
     int l;
+    int flags;
     struct stat sb;
     StoreEntry *e;
     LOCAL_ARRAY(char, path, MAXPATHLEN);
@@ -412,9 +413,11 @@ mimeLoadIconFile(const char *icon)
        debug(50, 0) ("mimeLoadIconFile: FD %d: fstat: %s\n", fd, xstrerror());
        return;
     }
+    flags = 0;
+    EBIT_SET(flags, REQ_CACHABLE);
     e = storeCreateEntry(url,
        url,
-       REQ_CACHABLE,
+       flags,
        METHOD_GET);
     assert(e != NULL);
     e->mem_obj->request = requestLink(urlParse(METHOD_GET, url));

diff --git a/src/store.cc b/src/store.cc
index 9a0c65bbf41ffbcb02bcd249d10a0abacda215da..bbd99dfde70abb5375679e26c20dccca25b840ba 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.339 1997/11/12 23:41:12 wessels Exp $
+ * $Id: store.cc,v 1.340 1997/11/14 05:13:28 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -861,6 +861,7 @@ storeCheckSwapOut(StoreEntry * e)
 
     new_mem_lo = lowest_offset;
     if (!EBIT_TEST(e->flag, ENTRY_CACHABLE)) {
+       assert(EBIT_TEST(e->flag, ENTRY_PRIVATE));
        memFreeDataUpto(mem->data, new_mem_lo);
        mem->inmem_lo = new_mem_lo;
        return;