From: Willy Tarreau <w@1wt.eu>
Date: Sun, 5 Apr 2015 23:06:42 +0000 (+0200)
Subject: MINOR: peers: no need for setting timeouts / conn_retries in peer_session_create()
X-Git-Tag: v1.6-dev2~222
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c5c68ec28c7fc922229b65c56c46e04389afc3a;p=thirdparty%2Fhaproxy.git

MINOR: peers: no need for setting timeouts / conn_retries in peer_session_create()

For the client side this is done already by stream_new(). For the
server side it will be done when establishing the connection.
---

diff --git a/src/peers.c b/src/peers.c
index d1a06d801d..084a97b8d9 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -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 */