BUG/MINOR: hlua: Apply socket timeout on server side only

In lua, the timeout that can be set on an Socket applet was applied on
client side and server side. In fact, it must only be applied on server
side, to apply a timeout on the connection. The client side is the applet.

This patch should fix the issue #3442. It must be backported to all
supported versions.

diff --git a/src/hlua.c b/src/hlua.c
index c50fb20b1d0963a44c9006f65e6a996cf04d7cfa..38f82182e61b2f52dbd8cd32c1785a1200d6890b 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -2744,7 +2744,6 @@ static int hlua_socket_init(struct appctx *appctx)
 
        if (csk_ctx->timeout) {
                s->sess->fe->timeout.connect = csk_ctx->timeout;
-               s->scf->ioto = csk_ctx->timeout;
                s->scb->ioto = csk_ctx->timeout;
        }
 
@@ -3722,7 +3721,6 @@ __LJMP static int hlua_socket_settimeout(struct lua_State *L)
        s = appctx_strm(csk_ctx->appctx);
 
        s->sess->fe->timeout.connect = tmout;
-       s->scf->ioto = tmout;
        s->scb->ioto = tmout;
 
        s->task->expire = (tick_is_expired(s->task->expire, now_ms) ? 0 : s->task->expire);