bugfix: we did not call our coroutine cleanup handlers right after our coroutine completes (either successfully or unsuccessfully) otherwise segmentation fault might happen when the Lua VM throws out unexpected exceptions like "attempt to yield across C-call boundary". thanks Lipin Dmitriy for the report in openresty#361.

Author: agentzh

src/ngx_http_lua_util.c

@@ -1196,6 +1196,11 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
 
             case 0:
 
+                if (ctx->cur_co_ctx->cleanup) {
+                    ctx->cur_co_ctx->cleanup(ctx->cur_co_ctx);
+                    ctx->cur_co_ctx->cleanup = NULL;
+                }
+
                 ngx_http_lua_probe_coroutine_done(r, ctx->cur_co_ctx->co, 1);
 
                 ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_DEAD;
@@ -1353,6 +1358,13 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
                 msg = "unknown reason";
             }
 
+#if 1
+            if (ctx->cur_co_ctx->cleanup) {
+                ctx->cur_co_ctx->cleanup(ctx->cur_co_ctx);
+                ctx->cur_co_ctx->cleanup = NULL;
+            }
+#endif
+
             ngx_http_lua_probe_coroutine_done(r, ctx->cur_co_ctx->co, 0);
 
             ctx->cur_co_ctx->co_status = NGX_HTTP_LUA_CO_DEAD;

t/077-sleep.t

@@ -10,7 +10,7 @@ log_level('debug');
 
 repeat_each(2);
 
-plan tests => repeat_each() * 43;
+plan tests => repeat_each() * 51;
 
 #no_diff();
 #no_long_string();
@@ -254,3 +254,55 @@ hello
 --- error_log
 API disabled in the context of log_by_lua*
 
+
+
+=== TEST 11: ngx.sleep() fails to yield (xpcall err handler)
+--- config
+    location = /t {
+        content_by_lua '
+            local function f()
+                return error(1)
+            end
+            local function err()
+                ngx.sleep(0.001)
+            end
+            xpcall(f, err)
+            ngx.say("ok")
+        ';
+    }
+--- request
+    GET /t
+--- response_body
+ok
+--- error_log
+lua clean up the timer for pending ngx.sleep
+--- no_error_log
+[error]
+
+
+
+=== TEST 12: ngx.sleep() fails to yield (require)
+--- http_config
+    lua_package_path "$prefix/html/?.lua;;";
+--- config
+    location = /t {
+        content_by_lua '
+            package.loaded["foosleep"] = nil
+            require "foosleep";
+        ';
+    }
+--- request
+    GET /t
+--- user_files
+>>> foosleep.lua
+ngx.sleep(0.001)
+
+--- response_body_like: 500 Internal Server Error
+--- error_code: 500
+--- wait: 0.2
+--- error_log eval
+[
+"lua clean up the timer for pending ngx.sleep",
+qr{runtime error: attempt to yield across (?:metamethod/)?C-call boundary},
+]
+