BUG/MEDIUM: http: fix body processing for the stats applet

Commit 9fbe18e ("MEDIUM: http: add a new option http-buffer-request")
introduced a regression due to a misplaced check causing the admin
mode of the HTTP stats not to work anymore.

This patch tried to ensure that when we need a request body for the
stats applet, and we have already waited for this body, we don't wait
for it again, but the condition was applied too early causing a
disabling of the entire processing the body, and based on the wrong
HTTP state (MSG_BODY) resulting in the test never matching.

Thanks to Chad Lavoie for reporting the problem.

This bug is 1.6-only, no backport is needed.

diff --git a/src/proto_http.c b/src/proto_http.c
index 4d352f7638b489a9ff4b479d9e79c640428a4f3d..def5670bb238b601651991c1d0c5312a718d4181 100644 (file)
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3293,10 +3293,11 @@ int http_handle_stats(struct stream *s, struct channel *req)
        }
 
        /* Was the status page requested with a POST ? */
-       if (unlikely(txn->meth == HTTP_METH_POST && txn->req.body_len > 0 && msg->msg_state < HTTP_MSG_BODY)) {
+       if (unlikely(txn->meth == HTTP_METH_POST && txn->req.body_len > 0)) {
                if (appctx->ctx.stats.flags & STAT_ADMIN) {
                        /* we'll need the request body, possibly after sending 100-continue */
-                       req->analysers |= AN_REQ_HTTP_BODY;
+                       if (msg->msg_state < HTTP_MSG_CHUNK_SIZE)
+                               req->analysers |= AN_REQ_HTTP_BODY;
                        appctx->st0 = STAT_HTTP_POST;
                }
                else {