From 8bfdea6ecef0bf981ac9b23c00301dd9b6edfe48 Mon Sep 17 00:00:00 2001 From: Jun Ouyang Date: Tue, 27 Oct 2026 16:53:32 +0800 Subject: [PATCH 1/2] change: require ngx_http_lua_module 0.10.33 and bumped version to 0.1.36. openresty/lua-nginx-module#2536 changes the FFI signature of ngx_http_lua_ffi_balancer_enable_keepalive(). Requiring the matching ngx_lua version fails early instead of calling it with the wrong arguments. --- lib/resty/core/base.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/resty/core/base.lua b/lib/resty/core/base.lua index 78df58d6d..844e0fcbf 100644 --- a/lib/resty/core/base.lua +++ b/lib/resty/core/base.lua @@ -19,10 +19,10 @@ local FREE_LIST_REF = 0 if subsystem == 'http' then if not ngx.config or not ngx.config.ngx_lua_version - or ngx.config.ngx_lua_version ~= 10032 + or ngx.config.ngx_lua_version ~= 10033 then local ver = ngx.config and tostring(ngx.config.ngx_lua_version) or 'nil' - error("ngx_http_lua_module 0.10.32 required but got " .. ver) + error("ngx_http_lua_module 0.10.33 required but got " .. ver) end elseif subsystem == 'stream' then @@ -35,7 +35,7 @@ elseif subsystem == 'stream' then end else - error("ngx_http_lua_module 0.10.32 or " + error("ngx_http_lua_module 0.10.33 or " .. "ngx_stream_lua_module 0.0.20 required") end @@ -143,7 +143,7 @@ local c_buf_type = ffi.typeof("char[?]") local _M = new_tab(0, 18) -_M.version = "0.1.35" +_M.version = "0.1.36" _M.new_tab = new_tab _M.clear_tab = clear_tab From ae2a29dc9e11b9138e780430969a87095455fedf Mon Sep 17 00:00:00 2001 From: Jun Ouyang Date: Tue, 27 Oct 2026 16:53:32 +0800 Subject: [PATCH 2/2] tests: TEMPORARY: build CI against the matching lua-nginx-module bump. --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 86829531b..238e2f952 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -101,7 +101,8 @@ jobs: git clone https://github.com/openresty/openresty.git ../openresty git clone https://github.com/openresty/openresty-devel-utils.git git clone https://github.com/openresty/ngx_devel_kit.git ../ndk-nginx-module - git clone https://github.com/openresty/lua-nginx-module.git ../lua-nginx-module + # TEMPORARY, drop once ngx_lua 10033 is on master + git clone -b change/bump-0.10.33 https://github.com/oowl/lua-nginx-module.git ../lua-nginx-module git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx git clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module git clone https://github.com/openresty/lua-resty-lrucache.git