tweaks: ported adjustments and missing test cases from the ngx_stream_lua module.

Author: thibaultcha

src/ngx_http_lua_util.c

@@ -1352,7 +1352,7 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
 
                 if (!ctx->cur_co_ctx->is_wrap) {
                     /*
-                     * ended successful, coroutine.resume returns true plus
+                     * ended successfully, coroutine.resume returns true plus
                      * any return values
                      */
                     lua_pushboolean(next_co, success);
@@ -1520,7 +1520,7 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
             if (orig_coctx->is_wrap) {
                 /*
                  * coroutine.wrap propagates errors
-                 * to the parent
+                 * to its parent coroutine
                  */
                 next_coctx->propagate_error = 1;
                 continue;

t/058-tcp-socket.t

@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * 219;
+plan tests => repeat_each() * 222;
 
 our $HtmlDir = html_dir;
 
@@ -3643,7 +3643,45 @@ lua http cleanup reuse
 
 
 
-=== TEST 60: options_table is nil
+=== TEST 60: setkeepalive on socket already shutdown
+--- config
+    location /t {
+        set $port $TEST_NGINX_MEMCACHED_PORT;
+
+        content_by_lua_block {
+            local sock = ngx.socket.tcp()
+            local port = ngx.var.port
+
+            local ok, err = sock:connect("127.0.0.1", port)
+            if not ok then
+                ngx.say("failed to connect: ", err)
+                return
+            end
+
+            ngx.say("connected: ", ok)
+
+            local ok, err = sock:close()
+            if not ok then
+                ngx.log(ngx.ERR, "failed to close socket: ", err)
+                return
+            end
+
+            local ok, err = sock:setkeepalive()
+            if not ok then
+                ngx.log(ngx.ERR, "failed to setkeepalive: ", err)
+            end
+        }
+    }
+--- request
+GET /t
+--- response_body
+connected: 1
+--- error_log
+failed to setkeepalive: closed
+
+
+
+=== TEST 61: options_table is nil
 --- config
     location /t {
         set $port $TEST_NGINX_MEMCACHED_PORT;
@@ -3693,7 +3731,7 @@ close: 1 nil
 
 
 
-=== TEST 61: resolver send query failing immediately in connect()
+=== TEST 62: resolver send query failing immediately in connect()
 this case did not clear coctx->cleanup properly and would lead to memory invalid accesses.
 
 this test case requires the following iptables rule to work properly:
@@ -3730,7 +3768,7 @@ qr{\[alert\] .*? send\(\) failed \(\d+: Operation not permitted\) while resolvin
 
 
 
-=== TEST 62: the upper bound of port range should be 2^16 - 1
+=== TEST 63: the upper bound of port range should be 2^16 - 1
 --- config
     location /t {
         content_by_lua_block {
@@ -3749,7 +3787,7 @@ failed to connect: bad port number: 65536
 
 
 
-=== TEST 63: send boolean and nil
+=== TEST 64: send boolean and nil
 --- config
     location /t {
         set $port $TEST_NGINX_SERVER_PORT;
@@ -3811,7 +3849,7 @@ received: truefalsenil
 
 
 
-=== TEST 64: receiveany method in cosocket
+=== TEST 65: receiveany method in cosocket
 --- config
     server_tokens off;
     location = /t {
@@ -3900,7 +3938,7 @@ lua tcp socket read any
 
 
 
-=== TEST 65: receiveany send data after read side closed
+=== TEST 66: receiveany send data after read side closed
 --- config
     server_tokens off;
     location = /t {
@@ -3944,7 +3982,7 @@ GET /t
 
 
 
-=== TEST 66: receiveany with limited, max <= 0
+=== TEST 67: receiveany with limited, max <= 0
 --- config
     location = /t {
         set $port $TEST_NGINX_SERVER_PORT;
@@ -3980,7 +4018,7 @@ GET /t
 
 
 
-=== TEST 67: receiveany with limited, max is larger than data
+=== TEST 68: receiveany with limited, max is larger than data
 --- config
     server_tokens off;
     location = /t {
@@ -4049,7 +4087,7 @@ lua tcp socket calling receiveany() method to read at most 128 bytes
 
 
 
-=== TEST 68: receiveany with limited, max is smaller than data
+=== TEST 69: receiveany with limited, max is smaller than data
 --- config
     server_tokens off;
     location = /t {

t/091-coroutine.t

@@ -1533,7 +1533,7 @@ co == co2: false
 --- config
     location = /t {
         content_by_lua_block {
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("co yield: ", cnt)
@@ -1567,7 +1567,7 @@ co yield: 2
 --- config
     location = /t {
         content_by_lua_block {
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     coroutine.yield(cnt, cnt + 1)
@@ -1601,7 +1601,7 @@ co yield: 2, 3
 --- config
     location = /t {
         content_by_lua_block {
-            function f(step)
+            local function f(step)
                 local cnt = 0
                 for i = 1, 20 do
                     ngx.say("co yield: ", cnt)
@@ -1637,7 +1637,7 @@ co yield: 2
         return 200;
 
         header_filter_by_lua_block {
-            function f()
+            local function f()
                 local cnt = 0
                 for i = 1, 20 do
                     print("co yield: ", cnt)

t/161-load-resty-core.t

@@ -38,7 +38,24 @@ resty.core loaded: true
 
 
 
-=== TEST 2: resty.core is automatically loaded in the Lua VM with 'lua_code_cache off'
+=== TEST 2: resty.core is automatically loaded in the Lua VM when 'lua_shared_dict' is used
+--- http_config
+    lua_shared_dict dogs 128k;
+--- config
+    location = /t {
+        content_by_lua_block {
+            local loaded_resty_core = package.loaded["resty.core"]
+            local resty_core = require "resty.core"
+
+            ngx.say("resty.core loaded: ", loaded_resty_core == resty_core)
+        }
+    }
+--- response_body
+resty.core loaded: true
+
+
+
+=== TEST 3: resty.core is automatically loaded in the Lua VM with 'lua_code_cache off'
 --- http_config
     lua_code_cache off;
 --- config
@@ -55,7 +72,7 @@ resty.core loaded: true
 
 
 
-=== TEST 3: resty.core loading honors the lua_package_path directive
+=== TEST 4: resty.core loading honors the lua_package_path directive
 --- http_config eval
     "lua_package_path '$::HtmlDir/?.lua;;';"
 --- config
@@ -82,7 +99,7 @@ return {
 
 
 
-=== TEST 4: resty.core not loading aborts the initialization
+=== TEST 5: resty.core not loading aborts the initialization
 --- http_config eval
     "lua_package_path '$::HtmlDir/?.lua;';"
 --- config
@@ -95,7 +112,7 @@ qr/\[alert\] .*? failed to load the 'resty\.core' module .*? \(reason: module 'r
 
 
 
-=== TEST 5: resty.core not loading produces an error with 'lua_code_cache off'
+=== TEST 6: resty.core not loading produces an error with 'lua_code_cache off'
 --- http_config
     lua_code_cache off;
 
@@ -116,7 +133,7 @@ qr/\[alert\] .*? failed to load the 'resty\.core' module/
 
 
 
-=== TEST 6: lua_load_resty_core logs a deprecation warning when specified (on)
+=== TEST 7: lua_load_resty_core logs a deprecation warning when specified (on)
 --- http_config
     lua_load_resty_core on;
 --- config
@@ -132,7 +149,7 @@ qr/\[warn\] .*? lua_load_resty_core is deprecated \(the lua-resty-core library i
 
 
 
-=== TEST 7: lua_load_resty_core logs a deprecation warning when specified (off)
+=== TEST 8: lua_load_resty_core logs a deprecation warning when specified (off)
 --- http_config
     lua_load_resty_core off;
 --- config