mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: stats: disable request analyser when processing POST or HEAD

Browse Source 
After the response headers are sent and the request processing is done,
the buffers are wiped out and the stream interface is closed. We must
then disable the request analysers, otherwise some processing will
happen on a closed stream interface and empty buffers which do not
match, causing all sort of crashes. This issue was introduced with
recent work on the stats, and was reported by Seri.
This commit is contained in:
Willy Tarreau 2012-12-28 08:36:50 +01:00
parent df97447088
commit cbc743e36c
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_http.c
View File

@ -2929,7 +2929,8 @@ int http_process_req_stat_post(struct stream_interface *si, struct http_txn *txn
/* This function checks whether we need to enable a POST analyser to parse a
* stats request, and also registers the stats I/O handler. It returns zero
* if it needs to come back again, otherwise non-zero if it finishes.
* if it needs to come back again, otherwise non-zero if it finishes. In the
* latter case, it also clears the request analysers.
*/
int http_handle_stats(struct session *s, struct channel *req)
{
@ -3012,6 +3013,7 @@ int http_handle_stats(struct session *s, struct channel *req)
s->flags |= SN_ERR_PRXCOND; // to mark that it comes from the proxy
if (!(s->flags & SN_FINST_MASK))
s->flags |= SN_FINST_R;
req->analysers = 0;
return 1;
}
@ -3045,6 +3047,7 @@ int http_handle_stats(struct session *s, struct channel *req)
/* that's all we return in case of HEAD request, so let's immediately close. */
stream_int_retnclose(req->prod, &trash);
s->target = &http_stats_applet.obj_type; /* just for logging the applet name */
req->analysers = 0;
return 1;
}
@ -3057,7 +3060,6 @@ int http_handle_stats(struct session *s, struct channel *req)
s->rep->prod->conn->xprt_ctx = s;
s->rep->prod->applet.st0 = s->rep->prod->applet.st1 = 0;
req->analysers = 0;
return 1;
}