From 13202cab88c523372c3be4cf83655f6c0b97a50d Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Mon, 2 Mar 2020 16:21:01 +0100 Subject: [PATCH] BUG/MINOR: http-ana: Reset request analysers on a response side error When an error occurred on the response side, request analysers must be reset. At this stage, only AN_REQ_HTTP_XFER_BODY analyser remains, and possibly AN_REQ_FLT_END, if at least one filter is attached to the stream. So it is safe to remove the AN_REQ_HTTP_XFER_BODY analyser. An error was already handled and a response was already returned to the client (or it was at least scheduled to be sent). So there is no reason to continue to process the request payload. It may cause some troubles for the filters because when an error occurred, data from the request buffer are truncated. This patch must be backported as far as 1.9, for the HTX part only. I don't know if the legacy HTTP code is affected. (cherry picked from commit e58c0002ff7dc1f88990171810f268ae26d0cf99) [wt: context adjustments since this place was already touched by b8a5371a] Signed-off-by: Willy Tarreau --- src/http_ana.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/http_ana.c b/src/http_ana.c index 9aee5bf..d7fa7ef 100644 --- a/src/http_ana.c +++ b/src/http_ana.c @@ -1834,6 +1834,7 @@ int http_wait_for_response(struct stream *s, struct channel *rep, int an_bit) s->si[1].flags |= SI_FL_NOLINGER; rep->analysers &= AN_RES_FLT_END; + s->req.analysers &= AN_REQ_FLT_END; rep->analyse_exp = TICK_ETERNITY; DBG_TRACE_DEVEL("leaving on error", STRM_EV_STRM_ANA|STRM_EV_HTTP_ANA|STRM_EV_HTTP_ERR, s, txn); @@ -2121,6 +2122,10 @@ int http_process_res_common(struct stream *s, struct channel *rep, int an_bit, s s->flags |= SF_ERR_PRXCOND; if (!(s->flags & SF_FINST_MASK)) s->flags |= SF_FINST_H; + + rep->analysers &= AN_RES_FLT_END; + s->req.analysers &= AN_REQ_FLT_END; + rep->analyse_exp = TICK_ETERNITY; DBG_TRACE_DEVEL("leaving on error", STRM_EV_STRM_ANA|STRM_EV_HTTP_ANA|STRM_EV_HTTP_ERR, s, txn); return 0; -- 1.7.10.4