]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: stream-int: use si_release_endpoint() to close idle conns
authorWilly Tarreau <w@1wt.eu>
Wed, 23 Sep 2015 15:56:02 +0000 (17:56 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 24 Sep 2015 09:57:34 +0000 (11:57 +0200)
We don't want to open-code the connection close code in
si_idle_conn_wake_cb() because we need to centralize some controls.

src/stream_interface.c

index b1bed032a70ce1cd30d88a0b5199d0a534c0dfb7..32210bbd30d6c666bedc95e58c6862df3e244125 100644 (file)
@@ -515,10 +515,7 @@ static int si_idle_conn_wake_cb(struct connection *conn)
 
        if (conn->flags & (CO_FL_ERROR | CO_FL_SOCK_RD_SH)) {
                /* warning, we can't do anything on <conn> after this call ! */
-               LIST_DEL(&conn->list);
-               conn_force_close(conn);
-               conn_free(conn);
-               si->end = NULL;
+               si_release_endpoint(si);
                return -1;
        }
        return 0;