Merging upstream version 3.0.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 51 insertions, 0 deletions

diff --git a/reg-tests/cache/vary.vtc b/reg-tests/cache/vary.vtc
index 6c8cedf..782a76c 100644
--- a/reg-tests/cache/vary.vtc
+++ b/reg-tests/cache/vary.vtc
@@ -91,6 +91,20 @@ server s1 {
               -hdr "Content-Encoding: gzip" \
               -bodylen 59
 
+       rxreq
+       expect req.url == "/origin-referer"
+       txresp -hdr "Vary: origin,referer" \
+              -hdr "Cache-Control: max-age=5" \
+              -hdr "Content-Encoding: gzip" \
+              -bodylen 60
+
+       rxreq
+       expect req.url == "/origin-referer"
+       txresp -hdr "Vary: origin,referer" \
+              -hdr "Cache-Control: max-age=5" \
+              -hdr "Content-Encoding: gzip" \
+              -bodylen 61
+
        # Multiple Accept-Encoding headers
        rxreq
        expect req.url == "/multiple_headers"
@@ -366,6 +380,43 @@ client c1 -connect ${h1_fe_sock} {
        expect resp.bodylen == 59
        expect resp.http.X-Cache-Hit == 1
 
+       # Mixed Vary (origin + Referer)
+       txreq -url "/origin-referer" \
+               -hdr "Accept-Encoding: br, gzip" \
+               -hdr "Referer: referer" \
+               -hdr "Origin: origin"
+       rxresp
+       expect resp.status == 200
+       expect resp.bodylen == 60
+       expect resp.http.X-Cache-Hit == 0
+
+       txreq -url "/origin-referer" \
+               -hdr "Accept-Encoding: br, gzip" \
+               -hdr "Referer: referer" \
+               -hdr "Origin: origin"
+       rxresp
+       expect resp.status == 200
+       expect resp.bodylen == 60
+       expect resp.http.X-Cache-Hit == 1
+
+       txreq -url "/origin-referer" \
+               -hdr "Accept-Encoding: br, gzip" \
+               -hdr "Referer: other-referer" \
+               -hdr "Origin: other-origin"
+       rxresp
+       expect resp.status == 200
+       expect resp.bodylen == 61
+       expect resp.http.X-Cache-Hit == 0
+
+       txreq -url "/origin-referer" \
+               -hdr "Accept-Encoding: br, gzip" \
+               -hdr "Referer: other-referer" \
+               -hdr "Origin: other-origin"
+       rxresp
+       expect resp.status == 200
+       expect resp.bodylen == 61
+       expect resp.http.X-Cache-Hit == 1
+
        # Multiple Accept-encoding headers
        txreq -url "/multiple_headers" \
                -hdr "Accept-Encoding: gzip" \