From: Willy Tarreau <w@1wt.eu>
Date: Sun, 8 Oct 2017 09:33:44 +0000 (+0200)
Subject: MEDIUM: stream: do not forcefully close the client connection anymore
X-Git-Tag: v1.8-rc1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=325607397;p=thirdparty%2Fhaproxy.git

MEDIUM: stream: do not forcefully close the client connection anymore

Now that the mux will take care of closing the client connection at the
right moment, we don't need to close the client connection anymore, and
we just need to close the conn_stream.
---

diff --git a/src/stream.c b/src/stream.c
index d347f472f7..5a5adb7f8e 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -296,7 +296,6 @@ static void stream_free(struct stream *s)
 	struct proxy *fe = sess->fe;
 	struct bref *bref, *back;
 	struct conn_stream *cli_cs = objt_cs(s->si[0].end);
-	struct connection *cli_conn = cs_conn(cli_cs);
 	int i;
 
 	if (s->pend_pos)
@@ -344,11 +343,8 @@ static void stream_free(struct stream *s)
 		http_end_txn(s);
 
 	/* ensure the client-side transport layer is destroyed */
-	/* XXX cognet: wrong for multiple streams in one connection */
-	if (cli_conn) {
-		conn_stop_tracking(cli_conn);
-		conn_full_close(cli_conn);
-	}
+	if (cli_cs)
+		cs_close(cli_cs);
 
 	for (i = 0; i < s->store_count; i++) {
 		if (!s->store[i].ts)