chore(patches): add patches from upstream openresty #13640
Conversation
github-actions
bot
added
build/bazel
cherry-pick kong-ee
There was a problem hiding this comment.
Doesn't apply cleanly, please fix these:
patching file bundle/ngx_lua-0.10.26/src/ngx_http_lua_socket_tcp.c
Hunk #1 succeeded at 5731 (offset 6 lines).
Hunk #2 succeeded at 5752 (offset 6 lines).
patching file bundle/ngx_stream_lua-0.0.14/src/ngx_stream_lua_socket_tcp.c
Hunk #1 succeeded at 5595 (offset 7 lines).
Hunk #2 succeeded at 5617 (offset 7 lines).
|
Also what is difference here compared to: Aka is this fixing some real issue we want to fix. The LuaJIT was a real issue, but hard to reproduce. Just wanting to know how to react on these. Are we always good to merge them or is there some other logic and why the LuaJIT patch was not part of that logic. |
catbro666
force-pushed
the
fti-6190-tcp-setkeepalive-tls13
branch
2 times, most recently
from
9d99d5e
to
abef72a
Compare
\### Summary \#### ngx_lua patches - openresty/lua-nginx-module@bf4bdcd - openresty/lua-nginx-module@ea09d92 - openresty/lua-nginx-module@816483d \#### ngx_stream_lua patches - openresty/stream-lua-nginx-module@5954e22 - openresty/stream-lua-nginx-module@69f0cd7 - openresty/stream-lua-nginx-module@1e1d93e https://konghq.atlassian.net/browse/FTI-6190
catbro666
force-pushed
the
fti-6190-tcp-setkeepalive-tls13
branch
from
abef72a
to
afba66b
Compare
team-gateway-bot
added
the
author/community
github-actions
bot
added
the
chore
so the connection can still be reused.
catbro666
force-pushed
the
fti-6190-tcp-setkeepalive-tls13
branch
from
09ec65b
to
06ac071
Compare
Fixed.
@bungle Yes, this patch is fixing a real issue discovered by https://konghq.atlassian.net/browse/FTI-6190 |
| if C.SSL_shutdown(self.ctx) ~= 1 then | ||
| return nil, format_error("SSL_shutdown") | ||
| end | ||
| self.sock:close() |
There was a problem hiding this comment.
To reviewers: SSL_shutdown only does a half-close, so the connection can still be used after being closed here. This causes some tests in tcp-log_spec.lua and reports_spec.lua to fail because the connection established by a previous test case is reused by the next test case.
Summary
Fixing the issue where a connection can't be setkeepalive successfully when using TLSv1.3. The issue was originally found in the tcp-log plugin.
ngx_lua patches
ngx_stream_lua patches
Checklist
changelog/unreleased/kongorskip-changeloglabel added on PR if changelog is unnecessary. README.mdIssue reference
https://konghq.atlassian.net/browse/FTI-6190