-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
fix(patches): add patches from upstream openresty #13640
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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. |
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
abef72a
to
afba66b
Compare
so the connection can still be reused.
09ec65b
to
06ac071
Compare
Fixed.
@bungle Yes, this patch is fixing a real issue discovered by https://konghq.atlassian.net/browse/FTI-6190 |
I have recategorized this PR from "chore" to "fix". |
* chore(patches): add patches from upstream openresty 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. \### 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 * chore(fixture): fix tcp_server, SSL_shutdown only does a half close, so the connection can still be reused. (cherry picked from commit eff5e8f)
Successfully created cherry-pick PR for |
Successfully created backport PR for |
* chore(patches): add patches from upstream openresty 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. \### 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 * chore(fixture): fix tcp_server, SSL_shutdown only does a half close, so the connection can still be reused. (cherry picked from commit eff5e8f)
* chore(patches): add patches from upstream openresty 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. \### 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 * chore(fixture): fix tcp_server, SSL_shutdown only does a half close, so the connection can still be reused.
* chore(patches): add patches from upstream openresty 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. \### 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 * chore(fixture): fix tcp_server, SSL_shutdown only does a half close, so the connection can still be reused. (cherry picked from commit eff5e8f)
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/kong
orskip-changelog
label added on PR if changelog is unnecessary. README.mdIssue reference
https://konghq.atlassian.net/browse/FTI-6190