BUG/MINOR: cache: Cache response even if request has "no-cache" directive
Since commit cc9bf2e5f "MEDIUM: cache: Change caching conditions"
responses that do not have an explicit expiration time are not cached
anymore. But this mechanism wrongly used the TX_CACHE_IGNORE flag
instead of the TX_CACHEABLE one. The effect this had is that a cacheable
response that corresponded to a request having a "Cache-Control:
no-cache" for instance would not be cached.
Contrary to what was said in the other commit message, the "checkcache"
option should not be impacted by the use of the TX_CACHEABLE flag
instead of the TX_CACHE_IGNORE one. The response is indeed considered as
not cacheable if it has no expiration time, regardless of the presence
of a cookie in the response.
This should fix GitHub issue #2048.
This patch can be backported up to branch 2.4.
(cherry picked from commit 879debeecb93202c983f25f5f1d765e74d77faa5)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit c6dbdbc94329c02402f2560299ca97f0c5a82e49)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit 5c3b4965e2f0af046c4df40e39fb3d21860f5de2)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 9687487fe73976576a91313e267c7e38e8660f3c)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/http_ana.c b/src/http_ana.c
index 2e2095b..b8d36fd 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -3929,7 +3929,7 @@
/* We won't store an entry that has neither a cache validator nor an
* explicit expiration time, as suggested in RFC 7234#3. */
if (!has_freshness_info && !has_validator)
- txn->flags |= TX_CACHE_IGNORE;
+ txn->flags &= ~TX_CACHEABLE;
}
/*