mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-13 15:00:59 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: compression: Check response headers before http-response rules eval

Browse Source 
This is required if we want to use res.comp or res.comp_algo sample fetches in
http-response rules.

This patch must be backported in 1.7.
This commit is contained in:
Christopher Faulet 2017-09-15 11:39:36 +02:00 committed by Willy Tarreau
parent 03d85538b3
commit 3dc860d19d
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/flt_http_comp.c
View File

@ -103,6 +103,12 @@ comp_start_analyze(struct stream *s, struct filter *filter, struct channel *chn)
st->initialized = 0; st->initialized = 0;
st->finished = 0; st->finished = 0;
filter->ctx = st; filter->ctx = st;
/* Register post-analyzer on AN_RES_WAIT_HTTP because we need to
* analyze response headers before http-response rules execution
* to be sure we can use res.comp and res.comp_algo sample
* fetches */
filter->post_analyzers |= AN_RES_WAIT_HTTP;
} }
return 1; return 1;
} }
@ -135,7 +141,8 @@ comp_http_headers(struct stream *s, struct filter *filter, struct http_msg *msg)
if (!(msg->chn->flags & CF_ISRESP)) if (!(msg->chn->flags & CF_ISRESP))
select_compression_request_header(st, s, msg); select_compression_request_header(st, s, msg);
else { else {
select_compression_response_header(st, s, msg); /* Response headers have already been checked in
* comp_http_post_analyze callback. */
if (st->comp_algo) { if (st->comp_algo) {
register_data_filter(s, msg->chn, filter); register_data_filter(s, msg->chn, filter);
st->hdrs_len = s->txn->rsp.sov; st->hdrs_len = s->txn->rsp.sov;
@ -146,6 +153,26 @@ comp_http_headers(struct stream *s, struct filter *filter, struct http_msg *msg)
return 1; return 1;
} }
static int
comp_http_post_analyze(struct stream *s, struct filter *filter,
struct channel *chn, unsigned an_bit)
{
struct http_txn *txn = s->txn;
struct http_msg *msg = &txn->rsp;
struct comp_state *st = filter->ctx;
if (an_bit != AN_RES_WAIT_HTTP)
goto end;
if (!strm_fe(s)->comp && !s->be->comp)
goto end;
select_compression_response_header(st, s, msg);
end:
return 1;
}
static int static int
comp_http_data(struct stream *s, struct filter *filter, struct http_msg *msg) comp_http_data(struct stream *s, struct filter *filter, struct http_msg *msg)
{ {
@ -768,6 +795,7 @@ struct flt_ops comp_ops = {
.channel_start_analyze = comp_start_analyze, .channel_start_analyze = comp_start_analyze,
.channel_end_analyze = comp_end_analyze, .channel_end_analyze = comp_end_analyze,
.channel_post_analyze = comp_http_post_analyze,
.http_headers = comp_http_headers, .http_headers = comp_http_headers,
.http_data = comp_http_data, .http_data = comp_http_data,