From: Willy Tarreau Date: Wed, 11 Jun 2014 14:49:14 +0000 (+0200) Subject: CLEANUP: http: don't clear CF_READ_NOEXP twice X-Git-Tag: v1.5.0~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1592d1e72a4a2d25a554c299ae95a3e6cad80bf1;p=thirdparty%2Fhaproxy.git CLEANUP: http: don't clear CF_READ_NOEXP twice Last patch cleared the flag twice in the response, which is useless. Thanks Lukas for spotting it :-) --- diff --git a/src/proto_http.c b/src/proto_http.c index 160c4a7604..bd9b13af3b 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -4755,7 +4755,7 @@ void http_end_txn_clean_session(struct session *s) s->req->cons->exp = TICK_ETERNITY; s->req->cons->flags &= SI_FL_DONT_WAKE; /* we're in the context of process_session */ s->req->flags &= ~(CF_SHUTW|CF_SHUTW_NOW|CF_AUTO_CONNECT|CF_WRITE_ERROR|CF_STREAMER|CF_STREAMER_FAST|CF_NEVER_WAIT|CF_WAKE_CONNECT|CF_READ_NOEXP); - s->rep->flags &= ~(CF_SHUTR|CF_SHUTR_NOW|CF_READ_ATTACHED|CF_READ_ERROR|CF_READ_NOEXP|CF_STREAMER|CF_STREAMER_FAST|CF_WRITE_PARTIAL|CF_NEVER_WAIT|CF_READ_NOEXP); + s->rep->flags &= ~(CF_SHUTR|CF_SHUTR_NOW|CF_READ_ATTACHED|CF_READ_ERROR|CF_READ_NOEXP|CF_STREAMER|CF_STREAMER_FAST|CF_WRITE_PARTIAL|CF_NEVER_WAIT); s->flags &= ~(SN_DIRECT|SN_ASSIGNED|SN_ADDR_SET|SN_BE_ASSIGNED|SN_FORCE_PRST|SN_IGNORE_PRST); s->flags &= ~(SN_CURR_SESS|SN_REDIRECTABLE|SN_SRV_REUSED);