upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-05-28 04:12:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BUG/MINOR: proto_htx: Fix request/response synchronisation on error

Browse source 
The HTTP transaction must be aborted if an error is detected on any one
side.
This commit is contained in:
Christopher Faulet 2018-11-19 21:59:00 +01:00
parent 9b95d31122
commit b42a8b6c61
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/proto_htx.c
View file

@ -4946,7 +4946,8 @@ static void htx_end_request(struct stream *s)
h1_msg_state_str(txn->req.msg_state), h1_msg_state_str(txn->rsp.msg_state),
s->req.analysers, s->res.analysers);
if (unlikely(txn->req.msg_state == HTTP_MSG_ERROR)) {
if (unlikely(txn->req.msg_state == HTTP_MSG_ERROR ||
txn->rsp.msg_state == HTTP_MSG_ERROR)) {
channel_abort(chn);
channel_truncate(chn);
goto end;
@ -5080,7 +5081,8 @@ static void htx_end_response(struct stream *s)
h1_msg_state_str(txn->req.msg_state), h1_msg_state_str(txn->rsp.msg_state),
s->req.analysers, s->res.analysers);
if (unlikely(txn->rsp.msg_state == HTTP_MSG_ERROR)) {
if (unlikely(txn->req.msg_state == HTTP_MSG_ERROR ||
txn->rsp.msg_state == HTTP_MSG_ERROR)) {
channel_truncate(chn);
channel_abort(&s->req);
goto end;