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

Jump to bottom

chore(src): upgrade to openresty 1.21.4.2 #61

Merged
merged 2 commits into from
Sep 8, 2023
Merged

chore(src): upgrade to openresty 1.21.4.2 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a71cceb
1.21.4.2rc1
chronolaw Apr 18, 2023
3a1de00
tests(tls): fix pattern in 001-tls.t
samugi Sep 7, 2023
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
1 change: 0 additions & 1 deletion config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ngx_module_type=HTTP
ngx_module_name=ngx_http_lua_kong_module
ngx_module_srcs=" \
$ngx_addon_dir/src/ngx_http_lua_kong_apple_m1.c \
$ngx_addon_dir/src/ngx_http_lua_kong_grpc.c \
$ngx_addon_dir/src/ngx_http_lua_kong_ssl.c \
$ngx_addon_dir/src/ngx_http_lua_kong_var.c \
Expand Down
131 changes: 0 additions & 131 deletions src/ngx_http_lua_kong_apple_m1.c
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions stream/src/ngx_stream_lua_kong_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,33 +297,3 @@ ngx_stream_lua_kong_get_upstream_ssl_verify(ngx_stream_session_t *s,
return ngx_lua_kong_ssl_get_upstream_ssl_verify(&ctx->ssl_ctx, proxy_ssl_verify);
}
#endif


// macOS with M1 fixes, see: https://github.com/LuaJIT/LuaJIT/issues/205

int
ngx_stream_lua_ffi_shdict_get_m1(ngx_shdict_get_t *s)
{
return ngx_stream_lua_ffi_shdict_get(s->zone, s->key, s->key_len, s->value_type,
s->str_value_buf, s->str_value_len, s->num_value, s->user_flags, s->get_stale,
s->is_stale, s->errmsg);
}


int
ngx_stream_lua_ffi_shdict_store_m1(ngx_shdict_store_t *s)
{
return ngx_stream_lua_ffi_shdict_store(s->zone, s->op, s->key, s->key_len, s->value_type,
s->str_value_buf, s->str_value_len, s->num_value, s->exptime, s->user_flags, s->errmsg,
s->forcible);
}


int
ngx_stream_lua_ffi_shdict_incr_m1(ngx_shdict_incr_t *s)
{
return ngx_stream_lua_ffi_shdict_incr(s->zone, s->key, s->key_len, s->num_value,
s->errmsg, s->has_init, s->init, s->init_ttl, s->forcible);
}

// macOS with M1 fixes end
4 changes: 2 additions & 2 deletions t/001-tls.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,8 @@ qpvBFOY29Mlww88oWNGTA8QeW84Y1EJbRkHavzSsMFB73sxidQW0cHNC5t9RCKAQ
uibeZgK1Yk7YQKXdvbZvXwrgTcAjCdbppw2L6e0Uy+OGgNjnIps8K460SdaIiA==
-----END CERTIFICATE-----

--- error_log
[lua] ssl_certificate_by_lua:2: ssl cert by lua is running!
--- error_log eval
qr/ssl_certificate_by_lua.*ssl cert by lua is running!/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the log was: [lua] ssl_certificate_by_lua(nginx.conf:30):2: ssl cert by lua is running!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What causes this change? any clue?

Copy link
Member

@samugi samugi Sep 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am trying to figure it out, not sure yet, but it looks like it may have something to do with the upgrade to 1.21.4.2

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chronolaw I think I found it: openresty/lua-nginx-module#2008, see how the tests changed: https://github.com/openresty/lua-nginx-module/pull/2008/files#diff-9f25aa4f9bc139d6b6d65bf14649c6524911dc99ca7fc92e3337867a969bee1dR120

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work, thank you @samugi


--- no_error_log
[error]
Expand Down
Loading