bugfix: tcpsock:setkeepalive(): we did not check NULL connection pointers properly. thanks Yang Yue for the report.

Author: agentzh

src/ngx_http_lua_socket_tcp.c

@@ -4335,7 +4335,8 @@ ngx_http_lua_socket_tcp_getreusedtimes(lua_State *L)
 }
 
 
-static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
+static int
+ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
 {
     ngx_http_lua_loc_conf_t             *llcf;
     ngx_http_lua_socket_tcp_upstream_t  *u;
@@ -4380,12 +4381,18 @@ static int ngx_http_lua_socket_tcp_setkeepalive(lua_State *L)
     u = lua_touserdata(L, -1);
     lua_pop(L, 1);
 
+    if (u == NULL) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "closed");
+        return 2;
+    }
+
     /* stack: obj cache key */
 
     pc = &u->peer;
     c = pc->connection;
 
-    if (u == NULL || pc == NULL || u->read_closed || u->write_closed) {
+    if (c == NULL || u->read_closed || u->write_closed) {
         lua_pushnil(L);
         lua_pushliteral(L, "closed");
         return 2;

t/058-tcp-socket.t

@@ -5,7 +5,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 172;
+plan tests => repeat_each() * 175;
 
 our $HtmlDir = html_dir;
 
@@ -3300,3 +3300,47 @@ close: 1 nil
 --- no_error_log
 [error]
 
+
+
+=== TEST 55: kill a thread with a connecting socket
+--- config
+    server_tokens off;
+    lua_socket_connect_timeout 1s;
+    resolver $TEST_NGINX_RESOLVER;
+    resolver_timeout 3s;
+    location /t {
+        content_by_lua '
+            local sock
+
+            local thr = ngx.thread.spawn(function ()
+                sock = ngx.socket.tcp()
+                local ok, err = sock:connect("agentzh.org", 12345)
+                if not ok then
+                    ngx.say("failed to connect: ", err)
+                    return
+                end
+
+                ngx.say("connected: ", ok)
+            end)
+
+            ngx.sleep(0.002)
+            ngx.thread.kill(thr)
+            ngx.sleep(0.001)
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.say("failed to setkeepalive: ", err)
+            else
+                ngx.say("setkeepalive: ", ok)
+            end
+        ';
+    }
+
+--- request
+GET /t
+--- response_body
+failed to setkeepalive: closed
+--- error_log
+lua tcp socket connect timeout: 100
+--- timeout: 10
+

t/128-duplex-tcp-socket.t

@@ -469,7 +469,7 @@ receive: nil closed
 send: nil closed
 close: nil closed
 getreusedtimes: nil closed
-setkeepalive: nil socket busy connecting
+setkeepalive: nil closed
 connect: nil socket busy connecting
 connect: nil some2.agentzh.org could not be resolved (110: Operation timed out)
 close: nil closed