Skip to content

Commit

Permalink
1.21.4.2rc1
Browse files Browse the repository at this point in the history
remove apple m1 compatible code

add `--no-openresty-patches` for build

search stream_lua path in config script

ngx_stream_lua_request.h

typo fix

test with 1.21.4.1
  • Loading branch information
chronolaw committed Apr 28, 2023
1 parent f248089 commit 29062f9
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 162 deletions.
1 change: 0 additions & 1 deletion config
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

This file was deleted.

30 changes: 0 additions & 30 deletions stream/src/ngx_stream_lua_kong_module.c
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

0 comments on commit 29062f9

Please sign in to comment.