From e58c0002ff7dc1f88990171810f268ae26d0cf99 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. --- src/http_ana.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/http_ana.c b/src/http_ana.c index b9067dd0c..4d85c9f31 100644 --- a/src/http_ana.c +++ b/src/http_ana.c @@ -1880,6 +1880,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); @@ -2184,7 +2185,8 @@ int http_process_res_common(struct stream *s, struct channel *rep, int an_bit, s if (!(s->flags & SF_FINST_MASK)) s->flags |= SF_FINST_H; - rep->analysers &= ~an_bit; + 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);