]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CLEANUP: stream.c: do not re-attach the connection to the stream
authorWilly Tarreau <w@1wt.eu>
Sat, 4 Apr 2015 23:05:44 +0000 (01:05 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 6 Apr 2015 09:37:33 +0000 (11:37 +0200)
This was a leftover from the initial code, it's not needed at all
anymore.

src/stream.c

index e0dc824a8c1a2f0202018a0517c264bf2be5da84..0d9a202063e2dce1e24c0c670a3d7acf9f785ded 100644 (file)
@@ -103,18 +103,6 @@ int stream_accept_session(struct session *sess, struct task *t)
        s->logs.tv_accept = sess->tv_accept;   /* corrected date for internal use */
        s->uniq_id = global.req_count++;
 
-       /* Add the minimum callbacks to prepare the connection's control layer.
-        * We need this so that we can safely execute the ACLs used by the
-        * "tcp-request connection" ruleset. We also carefully attach the
-        * connection to the stream interface without initializing the rest,
-        * so that ACLs can use si[0]->end.
-        */
-       si_attach_conn(&s->si[0], conn);
-       conn_attach(conn, s, &sess_conn_cb);
-
-       /* OK let's complete stream initialization since there is no handshake */
-       conn->flags |= CO_FL_CONNECTED;
-
        /* OK, we're keeping the stream, so let's properly initialize the stream */
        LIST_ADDQ(&streams, &s->list);
        LIST_INIT(&s->back_refs);