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

Openresty Update #1272

Merged
merged 13 commits into from
May 24, 2021
Merged

Openresty Update #1272

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d27264f
Bump Openresty version to 1.19.3
eloycoto May 10, 2021
a5d0419
Openresty Update: Fix management API.
eloycoto May 13, 2021
042e00e
Openresty Update: Skip setting the service on path routing.
eloycoto May 12, 2021
9e6c027
Openresty Update: Fix rate limit part with semaphores
eloycoto May 14, 2021
afd09ef
Openresty Update: Fix random ngx.encode_args
eloycoto May 11, 2021
80f205f
Openresty Update: Add json_keys helper on integration test.
eloycoto May 11, 2021
ff6ca74
Openresty Update: fix some integration tests
eloycoto May 11, 2021
63d51f5
Openresty Update: Remove APICAST_MODULE OPTION
eloycoto May 13, 2021
197452a
Openresty Update: Remove Oauth2
eloycoto May 14, 2021
f13f987
Openresty Update: fix some unit tests
eloycoto May 14, 2021
d19ec3a
Openresty Update: Fix headers ordering issues
eloycoto May 14, 2021
c213176
Openresty Update: Add openresty to path
eloycoto May 18, 2021
13d6802
Openresty Update: updating changelog
eloycoto May 20, 2021
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 .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ executors:
environment:
S2I_VERSION: "1.1.12-2a783420"
DOCKER_COMPOSE_VERSION: "1.16.1"
OPENRESTY_VERSION: "1.17.5.1-0-centos8"
OPENRESTY_VERSION: "1.19.3.1-0-centos8"

openresty:
working_directory: /opt/app-root/apicast
docker:
- image: quay.io/3scale/s2i-openresty-centos7:1.17.5.1-0-centos8
- image: quay.io/3scale/s2i-openresty-centos7:1.19.3.1-0-centos8
- image: redis:3.2.8-alpine
environment:
TEST_NGINX_BINARY: openresty
Expand Down
2 changes: 1 addition & 1 deletion gateway/src/resty/ctx.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function _M.ref()

local _ = ngx.ctx -- load context

local ctx_ref = C.ngx_http_lua_ffi_get_ctx_ref(r)
local ctx_ref = C.ngx_http_lua_ffi_get_ctx_ref(r, ffi.new("int[1]"), ffi.new("int[1]"))
Copy link
Contributor

Choose a reason for hiding this comment

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

What does this do?

Copy link
Contributor Author

@eloycoto eloycoto May 19, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

The C call definition changed, and now it needs to pass a integer.

Copy link
Contributor

Choose a reason for hiding this comment

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

Why 1? Does it matter? Or we can just send anything?
Would be good to clarify with a comment.


if ctx_ref == FFI_NO_REQ_CTX then
return error("no request ctx found")
Expand Down