From: Olivier Houchard <ohouchard@haproxy.com>
Date: Fri, 24 Jan 2020 14:37:37 +0000 (+0100)
Subject: MEDIUM: streams: Don't close the connection in back_handle_st_con().
X-Git-Tag: v2.2-dev2~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c30642eded79dd03b570e5afc48ae5af342d180;p=thirdparty%2Fhaproxy.git

MEDIUM: streams: Don't close the connection in back_handle_st_con().

In back_handle_st_con(), don't bother trying to close the connection, it
should be taken care of elsewhere.
---

diff --git a/src/backend.c b/src/backend.c
index a9d538d79f..930895b6b5 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1911,8 +1911,6 @@ void back_handle_st_con(struct stream *s)
 	struct stream_interface *si = &s->si[1];
 	struct channel *req = &s->req;
 	struct channel *rep = &s->res;
-	struct conn_stream *srv_cs = objt_cs(si->end);
-	struct connection *conn = srv_cs ? srv_cs->conn : __objt_conn(si->end);
 
 	DBG_TRACE_ENTER(STRM_EV_STRM_PROC|STRM_EV_SI_ST, s);
 
@@ -1933,11 +1931,6 @@ void back_handle_st_con(struct stream *s)
  done:
 	/* retryable error ? */
 	if (si->flags & (SI_FL_EXP|SI_FL_ERR)) {
-		if (!(s->flags & SF_SRV_REUSED)) {
-			conn_stop_tracking(conn);
-			conn_full_close(conn);
-		}
-
 		if (!si->err_type) {
 			if (si->flags & SI_FL_ERR)
 				si->err_type = SI_ET_CONN_ERR;