--------------------- PatchSet 2398 Date: 2001/05/28 16:20:44 Author: hno Branch: etag Tag: (none) Log: Various stupid bug fixes Members: src/store.c:1.12.14.4->1.12.14.5 Index: squid/src/store.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/store.c,v retrieving revision 1.12.14.4 retrieving revision 1.12.14.5 diff -u -r1.12.14.4 -r1.12.14.5 --- squid/src/store.c 28 May 2001 16:07:17 -0000 1.12.14.4 +++ squid/src/store.c 28 May 2001 16:20:44 -0000 1.12.14.5 @@ -1,6 +1,6 @@ /* - * $Id: store.c,v 1.12.14.4 2001/05/28 16:07:17 hno Exp $ + * $Id: store.c,v 1.12.14.5 2001/05/28 16:20:44 hno Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -384,7 +384,9 @@ { StoreEntry *pe; http_version_t version; - pe = storeCreateEntry(url, log_url, null_request_flags, method); + request_flags flags = null_request_flags; + flags.cachable = 1; + pe = storeCreateEntry(url, log_url, flags, method); httpBuildVersion(&version, 1, 0); httpReplySetHeaders(pe->mem_obj->reply, version, HTTP_OK, "Internal marker object", "x-squid-internal/vary", -1, -1, squid_curtime + 100000); httpHeaderPutStr(&pe->mem_obj->reply->header, HDR_VARY, vary); @@ -464,13 +466,13 @@ String vary = StringNull; String varyhdr; varyhdr = httpHeaderGetList(&mem->reply->header, HDR_VARY); - if (!strBuf(varyhdr)) + if (strBuf(varyhdr)) strListAdd(&vary, strBuf(varyhdr), ','); stringClean(&varyhdr); #if X_ACCELERATOR_VARY /* This needs to match the order in http.c:httpMakeVaryMark */ varyhdr = httpHeaderGetList(&mem->reply->header, HDR_X_ACCELERATOR_VARY); - if (!strBuf(varyhdr)) + if (strBuf(varyhdr)) strListAdd(&vary, strBuf(varyhdr), ','); stringClean(&varyhdr); #endif