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.

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

chore(deps): bump openresty to 1.27.1.1 #14163

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .requirements
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
KONG_PACKAGE_NAME=kong

OPENRESTY=1.25.3.2
OPENRESTY_SHA256=2d564022b06e33b45f7e5cfaf1e5dc571d38d61803af9fa2754dfff353c28d9c
OPENRESTY=1.27.1.1
OPENRESTY_SHA256=79b071e27bdc143d5f401d0dbf504de4420070d867538c5edc2546d0351fd5c0
LUAROCKS=3.11.1
LUAROCKS_SHA256=c3fb3d960dffb2b2fe9de7e3cb004dc4d0b34bb3d342578af84f84325c669102
OPENSSL=3.4.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/bundle/LuaJIT-2.1-20231117.1/src/luajit_rolling.h b/bundle/LuaJIT-2.1-20231117.1/src/luajit_rolling.h
diff --git a/bundle/LuaJIT-2.1-20240815/src/luajit_rolling.h b/bundle/LuaJIT-2.1-20240815/src/luajit_rolling.h
index f082974..d16d66b 100644
--- a/bundle/LuaJIT-2.1-20231117.1/src/luajit_rolling.h
+++ b/bundle/LuaJIT-2.1-20231117.1/src/luajit_rolling.h
--- a/bundle/LuaJIT-2.1-20240815/src/luajit_rolling.h
+++ b/bundle/LuaJIT-2.1-20240815/src/luajit_rolling.h
@@ -32,7 +32,9 @@

#define OPENRESTY_LUAJIT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/bundle/LuaJIT-2.1-20231117.1/src/Makefile b/bundle/LuaJIT-2.1-20231117.1/src/Makefile
diff --git a/bundle/LuaJIT-2.1-20240815/src/Makefile b/bundle/LuaJIT-2.1-20240815/src/Makefile
index d80e45a..f87762e 100644
--- a/bundle/LuaJIT-2.1-20231117.1/src/Makefile
+++ b/bundle/LuaJIT-2.1-20231117.1/src/Makefile
--- a/bundle/LuaJIT-2.1-20240815/src/Makefile
+++ b/bundle/LuaJIT-2.1-20240815/src/Makefile
@@ -26,7 +26,8 @@ NODOTABIVER= 51
DEFAULT_CC = gcc
#
Expand Down
26 changes: 0 additions & 26 deletions build/openresty/patches/lua-cjson-2.1.0.13_01-error-on-t_end.patch

This file was deleted.

15 changes: 15 additions & 0 deletions build/openresty/patches/lua-cjson-2.1.0.14_01-error-on-t_end.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/bundle/lua-cjson-2.1.0.14/lua_cjson.c b/bundle/lua-cjson-2.1.0.14/lua_cjson.c
index bbd8eff..c39c425 100644
--- a/bundle/lua-cjson-2.1.0.14/lua_cjson.c
+++ b/bundle/lua-cjson-2.1.0.14/lua_cjson.c
@@ -1495,6 +1495,10 @@ static int json_decode(lua_State *l)
if (token.type != T_END)
json_throw_parse_error(l, &json, "the end", &token);

+ /* Make sure T_END (\x00) doesn't occur at middle of input */
+ if (json.data + json_len > json.ptr)
+ json_throw_parse_error(l, &json, "EOF", &token);
+
strbuf_free(json.tmp);

return 1;

This file was deleted.

Loading
Loading