diff --git a/reg-tests/http-messaging/http_request_buffer.vtc b/reg-tests/http-messaging/http_request_buffer.vtc index e9a90c58f..15ec54045 100644 --- a/reg-tests/http-messaging/http_request_buffer.vtc +++ b/reg-tests/http-messaging/http_request_buffer.vtc @@ -24,7 +24,7 @@ server s1 { syslog S -level info { recv - expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe1 fe1/ .* 408 .* - - cD-- .* .* \"GET /this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url HTTP/1\\.1\"" + expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe1 fe1/ .* 408 .* - - cR-- .* .* \"GET /this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url HTTP/1\\.1\"" barrier b1 sync recv diff --git a/src/http_ana.c b/src/http_ana.c index 379b480a8..0189bb8d7 100644 --- a/src/http_ana.c +++ b/src/http_ana.c @@ -907,9 +907,8 @@ int http_wait_for_request_body(struct stream *s, struct channel *req, int an_bit { struct session *sess = s->sess; struct http_txn *txn = s->txn; - struct http_msg *msg = &s->txn->req; - DBG_TRACE_ENTER(STRM_EV_STRM_ANA|STRM_EV_HTTP_ANA, s, txn, msg); + DBG_TRACE_ENTER(STRM_EV_STRM_ANA|STRM_EV_HTTP_ANA, s, txn, &s->txn->req); switch (http_wait_for_msg_body(s, req, s->be->timeout.httpreq, 0)) { @@ -967,7 +966,7 @@ int http_wait_for_request_body(struct stream *s, struct channel *req, int an_bit if (!(s->flags & SF_ERR_MASK)) s->flags |= SF_ERR_PRXCOND; if (!(s->flags & SF_FINST_MASK)) - s->flags |= (msg->msg_state < HTTP_MSG_DATA ? SF_FINST_R : SF_FINST_D); + s->flags |= SF_FINST_R; req->analysers &= AN_REQ_FLT_END; req->analyse_exp = TICK_ETERNITY; @@ -4269,7 +4268,7 @@ enum rule_result http_wait_for_msg_body(struct stream *s, struct channel *chn, if (!(s->flags & SF_ERR_MASK)) s->flags |= SF_ERR_CLITO; if (!(s->flags & SF_FINST_MASK)) - s->flags |= SF_FINST_D; + s->flags |= SF_FINST_R; _HA_ATOMIC_INC(&sess->fe->fe_counters.failed_req); if (sess->listener && sess->listener->counters) _HA_ATOMIC_INC(&sess->listener->counters->failed_req); @@ -4282,7 +4281,7 @@ enum rule_result http_wait_for_msg_body(struct stream *s, struct channel *chn, if (!(s->flags & SF_ERR_MASK)) s->flags |= SF_ERR_SRVTO; if (!(s->flags & SF_FINST_MASK)) - s->flags |= SF_FINST_D; + s->flags |= SF_FINST_R; stream_inc_http_fail_ctr(s); http_reply_and_close(s, txn->status, http_error_message(s)); ret = HTTP_RULE_RES_ABRT;