Skip to content

Recover from an SSLSocket crash #1714

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
merged 2 commits into from
Oct 9, 2025
+14 −2
Merged

Recover from an SSLSocket crash #1714

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e54fc83
Recover from an SSLSocket crash
squarejesse Oct 9, 2025
38cc055
Call InputStream.close() / OutputStream.close() instead
squarejesse Oct 9, 2025
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
16 changes: 14 additions & 2 deletions okio/src/jvmMain/kotlin/okio/internal/DefaultSocket.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,13 @@ internal class DefaultSocket(val socket: JavaNetSocket) : Socket {
else -> {
if (socket.isClosed || socket.isOutputShutdown) return // Nothing to do.
outputStream.flush()
socket.shutdownOutput()
try {
socket.shutdownOutput()
} catch (_: UnsupportedOperationException) {
// Android API 21's SSLSocket doesn't implement this! So close the whole socket.
// https://github.com/square/okhttp/issues/9123
outputStream.close()
}
}
}
}
Expand Down Expand Up @@ -146,7 +152,13 @@ internal class DefaultSocket(val socket: JavaNetSocket) : Socket {
// Close this stream only.
else -> {
if (socket.isClosed || socket.isInputShutdown) return // Nothing to do.
socket.shutdownInput()
try {
socket.shutdownInput()
} catch (_: UnsupportedOperationException) {
// Android API 21's SSLSocket doesn't implement this! So close the whole socket.
// https://github.com/square/okhttp/issues/9123
inputStream.close()
}
}
}
}
Expand Down