]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: peers: no need for setting timeouts / conn_retries in peer_session_create()
authorWilly Tarreau <w@1wt.eu>
Sun, 5 Apr 2015 23:06:42 +0000 (01:06 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 6 Apr 2015 09:37:36 +0000 (11:37 +0200)
For the client side this is done already by stream_new(). For the
server side it will be done when establishing the connection.

src/peers.c

index d1a06d801def2bf5960f90844ec779f714f7e157..084a97b8d98162543445947958088a469495e6f6 100644 (file)
@@ -1152,7 +1152,6 @@ static struct stream *peer_session_create(struct peer *peer, struct peer_session
 
        /* initiate an outgoing connection */
        si_set_state(&s->si[1], SI_ST_ASS);
-       s->si[1].conn_retries = p->conn_retries;
 
        /* automatically prepare the stream interface to connect to the
         * pre-initialized connection in si->conn.
@@ -1168,11 +1167,6 @@ static struct stream *peer_session_create(struct peer *peer, struct peer_session
        s->do_log = NULL;
        s->uniq_id = 0;
 
-       s->req.rto = s->sess->fe->timeout.client;
-       s->req.wto = s->be->timeout.server;
-       s->res.rto = s->be->timeout.server;
-       s->res.wto = s->sess->fe->timeout.client;
-
        s->res.flags |= CF_READ_DONTWAIT;
 
        l->nbconn++; /* warning! right now, it's up to the handler to decrease this */