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

Jump to bottom

Don't reset previously closed stream, since it's racy. #7922

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Don't reset previously closed stream, since it's racy. #7922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d760f7
Don't reset previously closed stream, since it's racy.
yschimke Jul 2, 2023
39cc543
Merge branch 'master' into dont_cancel
yschimke Jul 8, 2023
8a447a2
Fix tests
yschimke Jul 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion okhttp/src/jvmMain/kotlin/okhttp3/internal/http2/Http2Connection.kt
View file
Open in desktop
Expand Up @@ -649,7 +649,10 @@ class Http2Connection internal constructor(builder: Builder) : Closeable {
}
val dataStream = getStream(streamId)
if (dataStream == null) {
writeSynResetLater(streamId, ErrorCode.PROTOCOL_ERROR)
if (streamId > lastGoodStreamId) {
// TODO should be a connection error for a data frame on an idle stream
writeSynResetLater(streamId, ErrorCode.PROTOCOL_ERROR)
}
updateConnectionFlowControl(length.toLong())
source.skip(length.toLong())
return
Expand Down
3 changes: 1 addition & 2 deletions okhttp/src/jvmTest/java/okhttp3/internal/http2/Http2ConnectionTest.kt
View file
Open in desktop
Expand Up @@ -204,8 +204,7 @@ class Http2ConnectionTest {
assertThat(frame1.type).isEqualTo(Http2.TYPE_HEADERS)
val frame2 = peer.takeFrame()
assertThat(frame2.type).isEqualTo(Http2.TYPE_RST_STREAM)
val frame3 = peer.takeFrame()
assertThat(frame3.type).isEqualTo(Http2.TYPE_RST_STREAM)
assertThat(peer.pollFrame()).isNull()
assertThat(connection.readBytes.acknowledged).isEqualTo(0L)
assertThat(connection.readBytes.total).isEqualTo(2048L)
}
Expand Down
2 changes: 2 additions & 0 deletions okhttp/src/jvmTest/java/okhttp3/internal/http2/MockHttp2Peer.kt
View file
Open in desktop
Expand Up @@ -87,6 +87,8 @@ class MockHttp2Peer : Closeable {

fun takeFrame(): InFrame = inFrames.take()

fun pollFrame(): InFrame? = inFrames.poll()

fun play() {
check(serverSocket == null)
serverSocket = ServerSocket()
Expand Down