mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-16 07:01:38 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: http-ana: Reset HTX first index when HAPRoxy sends a response

Browse Source 
The first index in an HTX message is the HTX block index from which the HTTP
analysis must be performed. When HAProxy sends an HTTP response, on error or
redirect, this index must be reset because all pending incoming data are
considered as forwarded. For now, it is only a bug for 103-Early-Hints
response. For other responses, it is not a problem. But it will be when the new
ruleset applied on all responses will be added. For 103 responses, if the first
index is not reset, if there are rewritting rules on server responses, the
generated 103 responses, if any, are evaluated too.

This patch must be backported and probably adapted, at least for 103 responses,
as far as 1.9.
This commit is contained in:
Christopher Faulet 2020-01-24 19:12:35 +01:00
parent 3b2bb63ded
commit 7a138dc908
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/http_act.c
View File

@ -1125,6 +1125,7 @@ static enum act_return http_action_early_hint(struct act_rule *rule, struct prox
data = htx->data - co_data(res); data = htx->data - co_data(res);
c_adv(res, data); c_adv(res, data);
htx->first = -1;
res->total += data; res->total += data;
} }

6
src/http_ana.c
View File

@ -2669,6 +2669,7 @@ int http_apply_redirect_rule(struct redirect_rule *rule, struct stream *s, struc
htx->flags |= HTX_FL_PROXY_RESP; htx->flags |= HTX_FL_PROXY_RESP;
data = htx->data - co_data(res); data = htx->data - co_data(res);
c_adv(res, data); c_adv(res, data);
htx->first = -1;
res->total += data; res->total += data;
channel_auto_read(req); channel_auto_read(req);
@ -4258,6 +4259,7 @@ void http_perform_server_redirect(struct stream *s, struct stream_interface *si)
*/ */
data = htx->data - co_data(res); data = htx->data - co_data(res);
c_adv(res, data); c_adv(res, data);
htx->first = -1;
res->total += data; res->total += data;
/* return without error. */ /* return without error. */
@ -4564,6 +4566,7 @@ void http_server_error(struct stream *s, struct stream_interface *si, int err,
htx->flags |= HTX_FL_PROXY_RESP; htx->flags |= HTX_FL_PROXY_RESP;
data = htx->data - co_data(chn); data = htx->data - co_data(chn);
c_adv(chn, data); c_adv(chn, data);
htx->first = -1;
chn->total += data; chn->total += data;
} }
} }
@ -4596,6 +4599,7 @@ void http_reply_and_close(struct stream *s, short status, struct buffer *msg)
htx->flags |= HTX_FL_PROXY_RESP; htx->flags |= HTX_FL_PROXY_RESP;
data = htx->data - co_data(chn); data = htx->data - co_data(chn);
c_adv(chn, data); c_adv(chn, data);
htx->first = -1;
chn->total += data; chn->total += data;
} }
} }
@ -4719,6 +4723,7 @@ static int http_reply_100_continue(struct stream *s)
data = htx->data - co_data(res); data = htx->data - co_data(res);
c_adv(res, data); c_adv(res, data);
htx->first = -1;
res->total += data; res->total += data;
return 0; return 0;
@ -4795,6 +4800,7 @@ static int http_reply_40x_unauthorized(struct stream *s, const char *auth_realm)
htx->flags |= HTX_FL_PROXY_RESP; htx->flags |= HTX_FL_PROXY_RESP;
data = htx->data - co_data(res); data = htx->data - co_data(res);
c_adv(res, data); c_adv(res, data);
htx->first = -1;
res->total += data; res->total += data;
channel_auto_read(&s->req); channel_auto_read(&s->req);