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: ctx being contaminated due to a new feature of openresty 1.19 #3105

Merged
merged 4 commits into from
Dec 24, 2020
Merged

fix: ctx being contaminated due to a new feature of openresty 1.19 #3105

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdb69be
fix: the bug that traffic is forwarded to wrong upstream due to ctx b…
johzchen Dec 22, 2020
6475721
chore: add comment about changes
johzchen Dec 22, 2020
c12b559
fix: clear ngx.ctx
johzchen Dec 23, 2020
7f00004
fix lint
johzchen Dec 24, 2020
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
14 changes: 8 additions & 6 deletions apisix/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,13 @@ function _M.http_ssl_phase()
if err then
core.log.error("failed to fetch ssl config: ", err)
end
-- clear the ctx of the ssl phase, avoid affecting other phases
ngx.ctx = nil
ngx_exit(-1)
spacewander marked this conversation as resolved.
Show resolved Hide resolved
end

-- clear the ctx of the ssl phase, avoid affecting other phases
ngx.ctx = nil
Copy link
Member

Choose a reason for hiding this comment

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

need comments

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed.

end


Expand Down Expand Up @@ -334,12 +339,9 @@ end

function _M.http_access_phase()
local ngx_ctx = ngx.ctx
local api_ctx = ngx_ctx.api_ctx

if not api_ctx then
api_ctx = core.tablepool.fetch("api_ctx", 0, 32)
ngx_ctx.api_ctx = api_ctx
end
-- always fetch table from the table pool, we don't need a reused api_ctx
local api_ctx = core.tablepool.fetch("api_ctx", 0, 32)
ngx_ctx.api_ctx = api_ctx
Copy link
Member

Choose a reason for hiding this comment

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

ditto

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed.


core.ctx.set_vars_meta(api_ctx)

Expand Down