RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-08 14:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] http: take care of errors, timeouts and aborts during the data phase

Browse Source 
In server-close mode particularly, the response buffer is marked for
no-auto-close after a response passed through. This prevented a POST
request from being aborted on errors, timeouts or anything if the
response was received before the request was complete.
This commit is contained in:
Willy Tarreau 2010-01-03 17:07:49 +01:00
parent bc5aa19e97
commit 6c2cbe14e4
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/proto_http.c
View File

@ -3256,7 +3256,10 @@ int http_request_forward_body(struct session *s, struct buffer *req, int an_bit)
struct http_txn *txn = &s->txn;
struct http_msg *msg = &s->txn.req;
if (req->flags & (BF_WRITE_ERROR|BF_WRITE_TIMEOUT)) {
if ((req->flags & (BF_READ_ERROR|BF_READ_TIMEOUT|BF_WRITE_ERROR|BF_WRITE_TIMEOUT)) ||
((req->flags & BF_SHUTW) && (req->to_forward || req->send_max))) {
/* Output closed while we were sending data. We must abort. */
buffer_ignore(req, req->l - req->send_max);
req->analysers &= ~an_bit;
return 1;
}
@ -4368,7 +4371,11 @@ int http_response_forward_body(struct session *s, struct buffer *res, int an_bit
struct http_txn *txn = &s->txn;
struct http_msg *msg = &s->txn.rsp;
if (res->flags & (BF_WRITE_ERROR|BF_WRITE_TIMEOUT)) {
if ((res->flags & (BF_READ_ERROR|BF_READ_TIMEOUT|BF_WRITE_ERROR|BF_WRITE_TIMEOUT)) ||
!s->req->analysers) {
/* in case of error or if the other analyser went away, we can't analyse HTTP anymore */
buffer_ignore(res, res->l - res->send_max);
buffer_auto_close(res);
res->analysers &= ~an_bit;
return 1;
}
@ -4515,6 +4522,8 @@ int http_response_forward_body(struct session *s, struct buffer *res, int an_bit
}
}
buffer_ignore(res, res->l - res->send_max);
buffer_auto_close(res);
res->analysers &= ~an_bit;
return 1;