1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
For the client side this is done already by stream_new(). For the
server side it will be done when establishing the connection.
This commit is contained in:
Willy Tarreau 2015-04-06 01:06:42 +02:00
parent 7ddf7c5641
commit 0c5c68ec28
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/peers.c
View 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 */