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

fix(core): disable C assert in upstream keepalive patch #10212

Merged
merged 3 commits into from
Feb 3, 2023
Merged

fix(core): disable C assert in upstream keepalive patch #10212

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31faac1
disable ngx_lua_assert
chronolaw Feb 2, 2023
9728b16
remove assert
chronolaw Feb 3, 2023
300a32f
fix patch
chronolaw Feb 3, 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
2 changes: 1 addition & 1 deletion build/openresty/patches/ngx_lua-0.10.21_02-dyn_upstream_keepalive.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ index f71a3e00..0d403716 100644
+
+ items = (ngx_http_lua_balancer_keepalive_item_t *) (&upool->free + 1);
+
+ ngx_http_lua_assert((void *) items == ngx_align_ptr(items, NGX_ALIGNMENT));
+ /*ngx_http_lua_assert((void *) items == ngx_align_ptr(items, NGX_ALIGNMENT));*/
Copy link
Member

Choose a reason for hiding this comment

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

We should remove this unneeded code, instead of commenting it out. It is a good habit to have.

+
+ for (i = 0; i < cpool_size; i++) {
+ ngx_queue_insert_head(&upool->free, &items[i].queue);
Expand Down