Skip to content

tls: fix detection of the upstream connection close event. #13858

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

Merged
ggreenway merged 8 commits into from
Nov 4, 2020
Merged

tls: fix detection of the upstream connection close event. #13858

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a60742
tls: fix detection of the upstream connection close event.
PiotrSikora Nov 2, 2020
47f12b9
review: add tests.
PiotrSikora Nov 2, 2020
ea472af
review: add comments.
PiotrSikora Nov 3, 2020
0ece50f
review: enable half-close in tests.
PiotrSikora Nov 3, 2020
ca79634
Merge remote-tracking branch 'origin/master' into PiotrSikora/tls_close
PiotrSikora Nov 3, 2020
a99576d
review: apply Greg's patch.
PiotrSikora Nov 3, 2020
ebfe0d4
review: add some expectations.
PiotrSikora Nov 4, 2020
28ac59f
Merge remote-tracking branch 'origin/master' into PiotrSikora/tls_close
PiotrSikora Nov 4, 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
1 change: 1 addition & 0 deletions docs/root/version_history/current.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Bug Fixes
* dns: fix a bug where custom resolvers provided in configuration were not preserved after network issues.
* http: fixed URL parsing for HTTP/1.1 fully qualified URLs and connect requests containing IPv6 addresses.
* http: sending CONNECT_ERROR for HTTP/2 where appropriate during CONNECT requests.
* tls: fix detection of the upstream connection close event.
Comment thread
PiotrSikora marked this conversation as resolved.
* tls: fix read resumption after triggering buffer high-watermark and all remaining request/response bytes are stored in the SSL connection's internal buffers.

Removed Config or Runtime
Expand Down
8 changes: 7 additions & 1 deletion source/extensions/transport_sockets/tls/ssl_socket.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,14 @@ Network::IoResult SslSocket::doRead(Buffer::Instance& read_buffer) {
case SSL_ERROR_ZERO_RETURN:
end_stream = true;
break;
case SSL_ERROR_SYSCALL:
if (result.error_.value() == 0) {
end_stream = true;
Comment thread
PiotrSikora marked this conversation as resolved.
break;
}
FALLTHRU;
case SSL_ERROR_WANT_WRITE:
// Renegotiation has started. We don't handle renegotiation so just fall through.
// Renegotiation has started. We don't handle renegotiation so just fall through.
Comment thread
PiotrSikora marked this conversation as resolved.
default:
drainErrorQueue();
action = PostIoAction::Close;
Expand Down