chore(module): upgrade to use OpenResty 1.21.4.2 (#61)

Removed no longer needed Apple hack since it has been upstreamed to OpenResty. --------- Co-authored-by: samugi <samuele@konghq.com>
Kong · Sep 8, 2023 · 8296b70 · 8296b70
1 parent 949131f
commit 8296b70
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 164 deletions.
diff --git a/config b/config
@@ -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 \

diff --git a/src/ngx_http_lua_kong_apple_m1.c b/src/ngx_http_lua_kong_apple_m1.c
diff --git a/stream/src/ngx_stream_lua_kong_module.c b/stream/src/ngx_stream_lua_kong_module.c
@@ -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
diff --git a/t/001-tls.t b/t/001-tls.t
@@ -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!/
 
 --- no_error_log
 [error]