]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: lua: no need for setting timeouts / conn_retries in hlua_socket_new()
authorWilly Tarreau <w@1wt.eu>
Sun, 5 Apr 2015 22:52:04 +0000 (00:52 +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/hlua.c

index 076da63e0e7eff51529a2523727f91e217761e70..0499ea39216f77529fbb2d9c5fb8e6d3e4e46fca 100644 (file)
@@ -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;