mirror of
https://github.com/novatiq/packages.git
synced 2026-07-27 22:13:49 +01:00
Christian Lachner
1784615d36
- Update haproxy download URL and hash - Add new patches (see https://www.haproxy.org/bugs/bugs-1.8.20.html) - Make halog use our CFLAGS - Update statically linked LUA to v5.3.5 Signed-off-by: Christian Lachner <gladiac@gmail.com>
250 lines
8.2 KiB
Diff
250 lines
8.2 KiB
Diff
commit a27131f6e1e6c3e16e056915ba5ec2c560051296
|
|
Author: Tim Duesterhus <tim@bastelstu.be>
|
|
Date: Mon Jun 17 16:10:07 2019 +0200
|
|
|
|
BUG/MEDIUM: compression: Set Vary: Accept-Encoding for compressed responses
|
|
|
|
Make HAProxy set the `Vary: Accept-Encoding` response header if it compressed
|
|
the server response.
|
|
|
|
Technically the `Vary` header SHOULD also be set for responses that would
|
|
normally be compressed based off the current configuration, but are not due
|
|
to a missing or invalid `Accept-Encoding` request header or due to the
|
|
maximum compression rate being exceeded.
|
|
|
|
Not setting the header in these cases does no real harm, though: An
|
|
uncompressed response might be returned by a Cache, even if a compressed
|
|
one could be retrieved from HAProxy. This increases the traffic to the end
|
|
user if the cache is unable to compress itself, but it saves another
|
|
roundtrip to HAProxy.
|
|
|
|
see the discussion on the mailing list: https://www.mail-archive.com/haproxy@formilux.org/msg34221.html
|
|
Message-ID: 20190617121708.GA2964@1wt.eu
|
|
|
|
A small issue remains: The User-Agent is not added to the `Vary` header,
|
|
despite being relevant to the response. Adding the User-Agent header would
|
|
make responses effectively uncacheable and it's unlikely to see a Mozilla/4
|
|
in the wild in 2019.
|
|
|
|
Add a reg-test to ensure the behaviour as described in this commit message.
|
|
|
|
see issue #121
|
|
Should be backported to all branches with compression (i.e. 1.6+).
|
|
|
|
(cherry picked from commit 721d686bd10dc6993859f9026ad907753d1d2064)
|
|
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
|
|
(cherry picked from commit eaf650083924a697cde3379703984c5e7a5ebd41)
|
|
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
|
|
(cherry picked from commit 96942d657ec7f29a328a5759558dbaa26d8e3e53)
|
|
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
|
|
|
|
[Cf: The patch was updated because there is no HTX in 1.8]
|
|
|
|
diff --git a/reg-tests/compression/vary.vtc b/reg-tests/compression/vary.vtc
|
|
new file mode 100644
|
|
index 00000000..0a060e4b
|
|
--- /dev/null
|
|
+++ b/reg-tests/compression/vary.vtc
|
|
@@ -0,0 +1,187 @@
|
|
+varnishtest "Compression sets Vary header"
|
|
+
|
|
+#REQUIRE_VERSION=1.9
|
|
+#REQUIRE_OPTION=ZLIB|SLZ
|
|
+
|
|
+feature ignore_unknown_macro
|
|
+
|
|
+server s1 {
|
|
+ rxreq
|
|
+ expect req.url == "/plain/accept-encoding-gzip"
|
|
+ expect req.http.accept-encoding == "gzip"
|
|
+ txresp \
|
|
+ -hdr "Content-Type: text/plain" \
|
|
+ -bodylen 100
|
|
+
|
|
+ rxreq
|
|
+ expect req.url == "/plain/accept-encoding-invalid"
|
|
+ expect req.http.accept-encoding == "invalid"
|
|
+ txresp \
|
|
+ -hdr "Content-Type: text/plain" \
|
|
+ -bodylen 100
|
|
+
|
|
+ rxreq
|
|
+ expect req.url == "/plain/accept-encoding-null"
|
|
+ expect req.http.accept-encoding == "<undef>"
|
|
+ txresp \
|
|
+ -hdr "Content-Type: text/plain" \
|
|
+ -bodylen 100
|
|
+
|
|
+ rxreq
|
|
+ expect req.url == "/html/accept-encoding-gzip"
|
|
+ expect req.http.accept-encoding == "gzip"
|
|
+ txresp \
|
|
+ -hdr "Content-Type: text/html" \
|
|
+ -bodylen 100
|
|
+
|
|
+ rxreq
|
|
+ expect req.url == "/html/accept-encoding-invalid"
|
|
+ expect req.http.accept-encoding == "invalid"
|
|
+ txresp \
|
|
+ -hdr "Content-Type: text/html" \
|
|
+ -bodylen 100
|
|
+
|
|
+
|
|
+ rxreq
|
|
+ expect req.url == "/html/accept-encoding-null"
|
|
+ expect req.http.accept-encoding == "<undef>"
|
|
+ txresp \
|
|
+ -hdr "Content-Type: text/html" \
|
|
+ -bodylen 100
|
|
+
|
|
+ rxreq
|
|
+ expect req.url == "/dup-etag/accept-encoding-gzip"
|
|
+ expect req.http.accept-encoding == "gzip"
|
|
+ txresp \
|
|
+ -hdr "Content-Type: text/plain" \
|
|
+ -hdr "ETag: \"123\"" \
|
|
+ -hdr "ETag: \"123\"" \
|
|
+ -bodylen 100
|
|
+} -repeat 2 -start
|
|
+
|
|
+
|
|
+haproxy h1 -conf {
|
|
+ defaults
|
|
+ mode http
|
|
+ ${no-htx} option http-use-htx
|
|
+ timeout connect 1s
|
|
+ timeout client 1s
|
|
+ timeout server 1s
|
|
+
|
|
+ frontend fe-gzip
|
|
+ bind "fd@${fe_gzip}"
|
|
+ default_backend be-gzip
|
|
+
|
|
+ backend be-gzip
|
|
+ compression algo gzip
|
|
+ compression type text/plain
|
|
+ server www ${s1_addr}:${s1_port}
|
|
+
|
|
+ frontend fe-nothing
|
|
+ bind "fd@${fe_nothing}"
|
|
+ default_backend be-nothing
|
|
+
|
|
+ backend be-nothing
|
|
+ server www ${s1_addr}:${s1_port}
|
|
+} -start
|
|
+
|
|
+client c1 -connect ${h1_fe_gzip_sock} {
|
|
+ txreq -url "/plain/accept-encoding-gzip" \
|
|
+ -hdr "Accept-Encoding: gzip"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.content-encoding == "gzip"
|
|
+ expect resp.http.vary == "Accept-Encoding"
|
|
+ gunzip
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/plain/accept-encoding-invalid" \
|
|
+ -hdr "Accept-Encoding: invalid"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/plain/accept-encoding-null"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/html/accept-encoding-gzip" \
|
|
+ -hdr "Accept-Encoding: gzip"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/html/accept-encoding-invalid" \
|
|
+ -hdr "Accept-Encoding: invalid"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/html/accept-encoding-null"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/dup-etag/accept-encoding-gzip" \
|
|
+ -hdr "Accept-Encoding: gzip"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+} -run
|
|
+
|
|
+# This Client duplicates c1, against the "nothing" frontend, ensuring no Vary header is ever set.
|
|
+client c2 -connect ${h1_fe_nothing_sock} {
|
|
+ txreq -url "/plain/accept-encoding-gzip" \
|
|
+ -hdr "Accept-Encoding: gzip"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/plain/accept-encoding-invalid" \
|
|
+ -hdr "Accept-Encoding: invalid"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/plain/accept-encoding-null"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/html/accept-encoding-gzip" \
|
|
+ -hdr "Accept-Encoding: gzip"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/html/accept-encoding-invalid" \
|
|
+ -hdr "Accept-Encoding: invalid"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/html/accept-encoding-null"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+
|
|
+ txreq -url "/dup-etag/accept-encoding-gzip" \
|
|
+ -hdr "Accept-Encoding: gzip"
|
|
+ rxresp
|
|
+ expect resp.status == 200
|
|
+ expect resp.http.vary == "<undef>"
|
|
+ expect resp.bodylen == 100
|
|
+} -run
|
|
diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
|
|
index b93ff69e..b48a4491 100644
|
|
--- a/src/flt_http_comp.c
|
|
+++ b/src/flt_http_comp.c
|
|
@@ -555,6 +555,9 @@ select_compression_response_header(struct comp_state *st, struct stream *s, stru
|
|
if (!(msg->flags & HTTP_MSGF_TE_CHNK))
|
|
http_header_add_tail2(&txn->rsp, &txn->hdr_idx, "Transfer-Encoding: chunked", 26);
|
|
|
|
+ /* add Vary header */
|
|
+ if (http_header_add_tail2(&txn->rsp, &txn->hdr_idx, "Vary: Accept-Encoding", 21) < 0)
|
|
+ goto fail;
|
|
/*
|
|
* Add Content-Encoding header when it's not identity encoding.
|
|
* RFC 2616 : Identity encoding: This content-coding is used only in the
|