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/MINOR: http-ana: Properly catch aborts during the payload forwarding

Browse Source 
When no data filter are registered on a channel, if the message length is known,
the HTTP payload is infinitely forwarded to save calls to process_stream(). When
we finally fall back again in XFER_BODY analyzers, we detect the end of the
message by checking channel flags. If CF_EOI or CF_SHUTR is set, we switch the
message in DONE state. For CF_EOI, it is relevant. But not for CF_SHUTR. a
shutdown for reads without the end of input must be interpreted as an abort for
messages with a known length.

Because of this bug, some aborts are not properly handled and reported. Instead,
we interpret it as a legitimate shutdown.

This patch must be backported to 2.0.
This commit is contained in:
Christopher Faulet 2019-11-15 11:29:40 +01:00
parent f3158e94ee
commit 145719a722
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http_ana.c
View File

@ -1166,7 +1166,7 @@ int http_request_forward_body(struct stream *s, struct channel *req, int an_bit)
if (req->to_forward) {
if (req->to_forward == CHN_INFINITE_FORWARD) {
if (req->flags & (CF_SHUTR|CF_EOI)) {
if (req->flags & CF_EOI) {
msg->msg_state = HTTP_MSG_DONE;
req->to_forward = 0;
goto done;
@ -2179,7 +2179,7 @@ int http_response_forward_body(struct stream *s, struct channel *res, int an_bit
if (res->to_forward) {
if (res->to_forward == CHN_INFINITE_FORWARD) {
if (res->flags & (CF_SHUTR|CF_EOI)) {
if (res->flags & CF_EOI) {
msg->msg_state = HTTP_MSG_DONE;
res->to_forward = 0;
goto done;