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

src/backend.c

index a9d538d79f43e39a94513b3ef7e5cf5d7da7ff3f..930895b6b509b0afdbe0a7fd8019e4f61e229df5 100644 (file)
@@ -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;