Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for OpenResty 1.27.1 compatibility #200

Merged
merged 1 commit into from
Feb 5, 2025
Merged

Update for OpenResty 1.27.1 compatibility #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,46 @@ jobs:
lua_nginx_module: "v0.10.26"
lua_resty_core: "v0.1.28"
nginx_cc_opts: "-Wno-error"
- nginx: "1.27.1"
openssl: "1.1.1w"
extras: "valgrind perf"
lua_nginx_module: "v0.10.27"
lua_resty_core: "v0.1.30"
- nginx: "1.27.1"
openssl: "3.0.15"
openssl_fips: "3.0.9"
extras: "valgrind perf lua-kong-nginx-module"
lua_nginx_module: "v0.10.27"
lua_resty_core: "v0.1.30"
nginx_cc_opts: "-Wno-error"
- nginx: "1.27.1"
openssl: "3.1.7"
openssl_fips: "3.0.9"
extras: "valgrind perf lua-kong-nginx-module"
lua_nginx_module: "v0.10.27"
lua_resty_core: "v0.1.30"
nginx_cc_opts: "-Wno-error"
- nginx: "1.27.1"
openssl: "3.2.3"
openssl_fips: "3.0.9"
extras: "valgrind perf lua-kong-nginx-module"
lua_nginx_module: "v0.10.27"
lua_resty_core: "v0.1.30"
nginx_cc_opts: "-Wno-error"
- nginx: "1.27.1"
openssl: "3.3.2"
openssl_fips: "3.0.9"
extras: "valgrind perf lua-kong-nginx-module"
lua_nginx_module: "v0.10.27"
lua_resty_core: "v0.1.30"
nginx_cc_opts: "-Wno-error"
- nginx: "1.27.1"
openssl: "3.4.0"
openssl_fips: "3.0.9"
extras: "valgrind perf lua-kong-nginx-module"
lua_nginx_module: "v0.10.27"
lua_resty_core: "v0.1.30"
nginx_cc_opts: "-Wno-error"


env:
Expand Down
7 changes: 4 additions & 3 deletions lib/resty/openssl/auxiliary/nginx.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ else
local ngx_has_http_v3 = ngx_configure and ngx_configure:find("--with-http_v3_module", 1, true)
-- https://github.com/nginx/nginx/blob/master/src/core/ngx_connection.h
if ngx_version == 1017008 or ngx_version == 1019003 or ngx_version == 1019009
or ngx_version == 1021004 or (not ngx_has_http_v3 and ngx_version == 1025003) then
or ngx_version == 1021004
or (not ngx_has_http_v3 and (ngx_version == 1025003 or ngx_version == 1027001)) then
-- 1.17.8, 1.19.3, 1.19.9, 1.21.4, 1.25.3
ffi.cdef [[
typedef struct ngx_proxy_protocol_s ngx_proxy_protocol_t;
Expand Down Expand Up @@ -82,7 +83,7 @@ else
// trimmed
} ngx_connection_s;
]]
elseif ngx_has_http_v3 and ngx_version == 1025003 then
elseif ngx_has_http_v3 and (ngx_version == 1025003 or ngx_version == 1027001) then
-- 1.25.3
ffi.cdef [[
typedef struct ngx_proxy_protocol_s ngx_proxy_protocol_t;
Expand Down Expand Up @@ -255,7 +256,7 @@ else
ngx.config.ngx_lua_version and
ngx.config.ngx_lua_version

if ngx_lua_version >= 10019 and ngx_lua_version <= 10026 then
if ngx_lua_version >= 10019 and ngx_lua_version <= 10027 then
-- https://github.com/openresty/lua-nginx-module/blob/master/src/ngx_http_lua_socket_tcp.h
ffi.cdef[[
typedef struct {
Expand Down
Loading