mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: streams: Don't give up if we couldn't send the request.

Browse Source 
In htx_request_forward_body(), don't give up if we failed to send the request,
and we have L7 retries activated. If we do, we will not retry when we should.

This should be backported to 2.0.
This commit is contained in:
Olivier Houchard 2019-07-12 15:48:58 +02:00 committed by Olivier Houchard
parent 234740f65d
commit 29cac3c5f7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/proto_htx.c
View File

@ -1163,6 +1163,12 @@ int htx_request_forward_body(struct stream *s, struct channel *req, int an_bit)
/* Output closed while we were sending data. We must abort and
* wake the other side up.
*/
/* Don't abort yet if we had L7 retries activated and it
* was a write error, we may recover.
*/
if (!(req->flags & (CF_READ_ERROR | CF_READ_TIMEOUT)) &&
(s->si[1].flags & SI_FL_L7_RETRY))
return 0;
msg->err_state = msg->msg_state;
msg->msg_state = HTTP_MSG_ERROR;
htx_end_request(s);