BUG/MEDIUM: cache: Vary not working properly on anything other than accept-encoding
If a response varies on anything other than accept-encoding (origin or
referer) but still contains an 'Encoding' header, the cached responses
were never sent back.
This is because of the 'set_secondary_key_encoding' call that always
filled the accept-encoding part of the secondary signature with the
response's actual encoding, regardless of whether the response varies on
this or not. This meant that the accept-encoding part of the signature
could be non-null in the cached entry which made the
'get_secondary_entry' calls in 'http_action_req_cache_use' always fail
because in those cases the request's secondary signature always had a
null accept-encoding part.
This patch can be backported up to branch 2.4.
(cherry picked from commit 0610f52bcd0a4bc7d13f92072786617f46298818)
Signed-off-by: William Lallemand <wlallemand@haproxy.com>
(cherry picked from commit f77626b45204989afe52fa987fab4b391797f684)
Signed-off-by: Amaury Denoyelle <adenoyelle@haproxy.com>
(cherry picked from commit da7f2707fc99a603de16aa50cc9607c7143ab3da)
Signed-off-by: Amaury Denoyelle <adenoyelle@haproxy.com>
(cherry picked from commit a290e93da3af364b994992e2ae168f056265f7c2)
Signed-off-by: Amaury Denoyelle <adenoyelle@haproxy.com>
diff --git a/src/cache.c b/src/cache.c
index ae13324..a5fa3c3 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -942,7 +942,7 @@
* "vary" on the accept-encoding value.
* Returns 0 if we found a known encoding in the response, -1 otherwise.
*/
-static int set_secondary_key_encoding(struct htx *htx, char *secondary_key)
+static int set_secondary_key_encoding(struct htx *htx, unsigned int vary_signature, char *secondary_key)
{
unsigned int resp_encoding_bitmap = 0;
const struct vary_hashing_information *info = vary_information;
@@ -952,6 +952,11 @@
unsigned int encoding_value;
struct http_hdr_ctx ctx = { .blk = NULL };
+ /* We must not set the accept encoding part of the secondary signature
+ * if the response does not vary on 'Accept Encoding'. */
+ if (!(vary_signature & VARY_ACCEPT_ENCODING))
+ return 0;
+
/* Look for the accept-encoding part of the secondary_key. */
while (count < hash_info_count && info->value != VARY_ACCEPT_ENCODING) {
offset += info->hash_length;
@@ -1210,7 +1215,7 @@
* We will not cache a response that has an unknown encoding (not
* explicitly supported in parse_encoding_value function). */
if (cache->vary_processing_enabled && vary_signature)
- if (set_secondary_key_encoding(htx, object->secondary_key))
+ if (set_secondary_key_encoding(htx, vary_signature, object->secondary_key))
goto out;
shctx_lock(shctx);