Bug 2258: bypassing cache but not destroying cache entry

diff --git a/src/http.cc b/src/http.cc
index f985cdc936a8c3100cabb0c49a270a98f0bf6f60..102b9b0b198d112c7ca726944e796f4a063c5136 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -189,6 +189,12 @@ httpMaybeRemovePublic(StoreEntry * e, Http::StatusCode status)
     if (!EBIT_TEST(e->flags, KEY_PRIVATE))
         return;
 
+    // If the new/incoming response cannot be stored, then it does not
+    // compete with the old stored response for the public key, and the
+    // old stored response should be left as is.
+    if (e->mem_obj->request && !e->mem_obj->request->flags.cachable)
+        return;
+
     switch (status) {
 
     case Http::scOkay: