]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MEDIUM: stream: do not forcefully close the client connection anymore
authorWilly Tarreau <w@1wt.eu>
Sun, 8 Oct 2017 09:33:44 +0000 (11:33 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 31 Oct 2017 17:03:24 +0000 (18:03 +0100)
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.

src/stream.c

index d347f472f72e076fb2f1808f26aa89ec078a4d13..5a5adb7f8eb8391616f9398ce9b9cf7c5bee0c61 100644 (file)
@@ -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)