]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MEDIUM: streams: Don't close the connection in back_handle_st_rdy().
authorOlivier Houchard <ohouchard@haproxy.com>
Fri, 24 Jan 2020 14:24:32 +0000 (15:24 +0100)
committerOlivier Houchard <cognet@ci0.org>
Fri, 24 Jan 2020 14:40:34 +0000 (15:40 +0100)
In back_handle_st_rdy(), don't bother trying to close the connection, it
should be taken care of somewhere else.

src/backend.c

index 930895b6b509b0afdbe0a7fd8019e4f61e229df5..45fe5366a255223cdff26370add92be17e1fadb0 100644 (file)
@@ -2071,8 +2071,6 @@ void back_handle_st_rdy(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);
        /* We know the connection at least succeeded, though it could have
@@ -2110,11 +2108,6 @@ void back_handle_st_rdy(struct stream *s)
 
                /* retryable error ? */
                if (si->flags & SI_FL_ERR) {
-                       if (!(s->flags & SF_SRV_REUSED) && conn) {
-                               conn_stop_tracking(conn);
-                               conn_full_close(conn);
-                       }
-
                        if (!si->err_type)
                                si->err_type = SI_ET_CONN_ERR;
                        si->state = SI_ST_CER;