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

[4.x] Fix for stalled streams (#7801) #7818

Merged
merged 1 commit into from
Sep 15, 2023
Merged

[4.x] Fix for stalled streams (#7801) #7818

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
30 changes: 15 additions & 15 deletions okhttp/src/main/kotlin/okhttp3/internal/http2/Http2Stream.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,8 @@ class Http2Stream internal constructor(

val unacknowledgedBytesRead = readBytesTotal - readBytesAcknowledged
if (errorExceptionToDeliver == null &&
unacknowledgedBytesRead >= connection.okHttpSettings.initialWindowSize / 2) {
unacknowledgedBytesRead >= connection.okHttpSettings.initialWindowSize / 2
) {
// Flow control: notify the peer that we're ready for more data! Only send a
// WINDOW_UPDATE if the stream isn't in error.
connection.writeWindowUpdateLater(id, unacknowledgedBytesRead)
Expand All @@ -387,8 +388,6 @@ class Http2Stream internal constructor(
}

if (readBytesDelivered != -1L) {
// Update connection.unacknowledgedBytesRead outside the synchronized block.
updateConnectionFlowControl(readBytesDelivered)
return readBytesDelivered
}

Expand Down Expand Up @@ -418,41 +417,39 @@ class Http2Stream internal constructor(
internal fun receive(source: BufferedSource, byteCount: Long) {
[email protected]()

var byteCount = byteCount
var remainingByteCount = byteCount

while (byteCount > 0L) {
while (remainingByteCount > 0L) {
val finished: Boolean
val flowControlError: Boolean
synchronized(this@Http2Stream) {
finished = this.finished
flowControlError = byteCount + readBuffer.size > maxByteCount
flowControlError = remainingByteCount + readBuffer.size > maxByteCount
}

// If the peer sends more data than we can handle, discard it and close the connection.
if (flowControlError) {
source.skip(byteCount)
source.skip(remainingByteCount)
closeLater(ErrorCode.FLOW_CONTROL_ERROR)
return
}

// Discard data received after the stream is finished. It's probably a benign race.
if (finished) {
source.skip(byteCount)
source.skip(remainingByteCount)
return
}

// Fill the receive buffer without holding any locks.
val read = source.read(receiveBuffer, byteCount)
val read = source.read(receiveBuffer, remainingByteCount)
if (read == -1L) throw EOFException()
byteCount -= read
remainingByteCount -= read

// Move the received data to the read buffer to the reader can read it. If this source has
// been closed since this read began we must discard the incoming data and tell the
// connection we've done so.
var bytesDiscarded = 0L
synchronized(this@Http2Stream) {
if (closed) {
bytesDiscarded = receiveBuffer.size
receiveBuffer.clear()
} else {
val wasEmpty = readBuffer.size == 0L
Expand All @@ -462,10 +459,13 @@ class Http2Stream internal constructor(
}
}
}
if (bytesDiscarded > 0L) {
updateConnectionFlowControl(bytesDiscarded)
}
}

// Update the connection flow control, as this is a shared resource.
// Even if our stream doesn't need more data, others might.
// But delay updating the stream flow control until that stream has been
// consumed
updateConnectionFlowControl(byteCount)
}

override fun timeout(): Timeout = readTimeout
Expand Down