From: Willy Tarreau <w@1wt.eu>
Date: Sun, 5 Apr 2015 22:52:04 +0000 (+0200)
Subject: MINOR: lua: no need for setting timeouts / conn_retries in hlua_socket_new()
X-Git-Tag: v1.6-dev2~223
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ddf7c5641ff7b2f4ed9323dedc4a70f6c74c36d;p=thirdparty%2Fhaproxy.git

MINOR: lua: no need for setting timeouts / conn_retries in hlua_socket_new()

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/hlua.c b/src/hlua.c
index 076da63e0e..0499ea3921 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -2065,18 +2065,11 @@ __LJMP static int hlua_socket_new(lua_State *L)
 	strm->hlua.flags = 0;
 	LIST_INIT(&strm->hlua.com);
 
-	/* Adjust the stream's timeouts */
-	strm->req.rto = socket_proxy.timeout.client;
-	strm->req.wto = socket_proxy.timeout.server;
-	strm->res.rto = socket_proxy.timeout.server;
-	strm->res.wto = socket_proxy.timeout.client;
-
 	/* Configure "right" stream interface. this "si" is used to connect
 	 * and retrieve data from the server. The connection is initialized
 	 * with the "struct server".
 	 */
 	si_set_state(&strm->si[1], SI_ST_ASS);
-	strm->si[1].conn_retries = socket_proxy.conn_retries;
 
 	/* Force destination server. */
 	strm->flags |= SF_DIRECT | SF_ASSIGNED | SF_ADDR_SET | SF_BE_ASSIGNED;