Skip to content
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

Avoid infinite wait on bad response handling. #7954

Merged
merged 1 commit into from
Oct 2, 2023
Merged

Avoid infinite wait on bad response handling. #7954

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Stream.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,12 @@ class Http2Stream internal constructor(
if (this.errorCode != null) {
return false
}
if (source.finished && sink.finished) {
return false
}
this.errorCode = errorCode
this.errorException = errorException
notifyAll()
if (source.finished && sink.finished) {
return false
}
}
connection.removeStream(id)
return true
Expand Down Expand Up @@ -491,7 +491,7 @@ class Http2Stream internal constructor(
// But delay updating the stream flow control until that stream has been
// consumed
updateConnectionFlowControl(byteCount)

// Notify that buffer size changed
connection.flowControlListener.receivingStreamWindowChanged(id, readBytes, readBuffer.size)
}
Expand Down