fix(patches): add patches from upstream openresty #13640
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
build/bazel
cherry-pick kong-ee
bungle
previously requested changes
Sep 11, 2024
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
outsinre
approved these changes
Sep 13, 2024
\### 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 |
catbro666
commented
Oct 16, 2024
team-eng-enablement
removed
the
author/community
oowl
approved these changes
Nov 25, 2024
kikito
changed the title
|
I have recategorized this PR from "chore" to "fix". |
github-actions bot
pushed a commit
that referenced
this pull request
Nov 29, 2024
* 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)
3 tasks
|
Successfully created cherry-pick PR for |
|
Successfully created backport PR for |
ms2008
pushed a commit
that referenced
this pull request
Nov 29, 2024
* 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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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