RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-18 01:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: http-ana: Don't wait for the body of CONNECT requests

Browse Source 
CONNECT requests are bodyless messages but with no EOM blocks. Thus, conditions
to stop waiting for the message payload are not suited to this kind of
messages. Indeed, the message finishes on an EOH block. But the tunnel mode at
the stream level is only set in HTTP_XFER_BODY analyser. So, the stream is
blocked, waiting for a body that does not exist till a timeout expires.

To fix this bug, we just stop waiting for a body for CONNECT requests. Another
solution is to rely on HTX_SL_F_BODYLESS/HTTP_MSGF_BODYLESS flags. But this one
is less intrusive.

This message must be backported as far as 2.0. For the 2.0, only the HTX part
must be fixed.
This commit is contained in:
Christopher Faulet 2020-11-16 16:03:35 +01:00
parent 22fca1f2c8
commit 63c69a9b4e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http_ana.c
View File

@ -1044,6 +1044,10 @@ int http_wait_for_request_body(struct stream *s, struct channel *req, int an_bit
if (htx->flags & HTX_FL_PROCESSING_ERROR)
goto return_int_err;
/* CONNECT requests have no body */
if (txn->meth == HTTP_METH_CONNECT)
goto http_end;
if (msg->msg_state < HTTP_MSG_BODY)
goto missing_data;