From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 2 Aug 2018 17:23:15 +0000 (+0000)
Subject: Do not update stored headers on HTTP 304 responses (#267)
X-Git-Tag: M-staged-PR267
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60ba25f;p=thirdparty%2Fsquid.git

Do not update stored headers on HTTP 304 responses (#267)

... until we learn how to synchronize stored and in-transit metadata.

This temporary disables a feature first introduced in commit abf396e.
---

diff --git a/src/store/Controller.cc b/src/store/Controller.cc
index 3ed7b5ad40..68d2b4a869 100644
--- a/src/store/Controller.cc
+++ b/src/store/Controller.cc
@@ -688,13 +688,9 @@ Store::Controller::updateOnNotModified(StoreEntry *old, const StoreEntry &newer)
     if (!old->timestampsSet() && !modified)
         return;
 
-    /* update stored image of the old entry */
-
-    if (sharedMemStore && old->mem_status == IN_MEMORY && !EBIT_TEST(old->flags, ENTRY_SPECIAL))
-        sharedMemStore->updateHeaders(old);
-
-    if (old->hasDisk())
-        swapDir->updateHeaders(old);
+    // XXX: Call memStore->updateHeaders(old) and swapDir->updateHeaders(old) to
+    // update stored headers, stored metadata, and in-transit metadata.
+    debugs(20, 3, *old << " headers were modified: " << modified);
 }
 
 bool