Do not send QPACK Stream Cancellation instruction. This partially reverts cl/282861038. gfe-relnote: n/a, change to QUIC v99-only code. Protected by existing disabled gfe2_reloadable_flag_quic_enable_version_99. PiperOrigin-RevId: 283820632 Change-Id: Ibef99ad60c66c2ba20803dca9af0fba7212b6f8b
diff --git a/quic/core/http/quic_spdy_stream.cc b/quic/core/http/quic_spdy_stream.cc index d25f99d..f7a13f6 100644 --- a/quic/core/http/quic_spdy_stream.cc +++ b/quic/core/http/quic_spdy_stream.cc
@@ -680,10 +680,7 @@ void QuicSpdyStream::OnStreamReset(const QuicRstStreamFrame& frame) { if (frame.error_code != QUIC_STREAM_NO_ERROR) { - if (VersionUsesHttp3(transport_version()) && !fin_received() && - spdy_session_->qpack_decoder()) { - spdy_session_->qpack_decoder()->OnStreamReset(id()); - } + // TODO(b/145684124) Call QpackDecoder::OnStreamReset(). QuicStream::OnStreamReset(frame); return; @@ -698,10 +695,7 @@ } void QuicSpdyStream::Reset(QuicRstStreamErrorCode error) { - if (VersionUsesHttp3(transport_version()) && !fin_received() && - spdy_session_->qpack_decoder()) { - spdy_session_->qpack_decoder()->OnStreamReset(id()); - } + // TODO(b/145684124) Call QpackDecoder::OnStreamReset(). QuicStream::Reset(error); }
diff --git a/quic/core/http/quic_spdy_stream_test.cc b/quic/core/http/quic_spdy_stream_test.cc index f834865..62ef3b5 100644 --- a/quic/core/http/quic_spdy_stream_test.cc +++ b/quic/core/http/quic_spdy_stream_test.cc
@@ -2531,7 +2531,8 @@ // Stream Cancellation instruction is sent on QPACK decoder stream // when stream is reset. -TEST_P(QuicSpdyStreamTest, StreamCancellationWhenStreamReset) { +// TODO(b/145684124) Re-enable. +TEST_P(QuicSpdyStreamTest, DISABLED_StreamCancellationWhenStreamReset) { if (!UsesHttp3()) { return; } @@ -2550,7 +2551,8 @@ // Stream Cancellation instruction is sent on QPACK decoder stream // when RESET_STREAM frame is received. -TEST_P(QuicSpdyStreamTest, StreamCancellationOnResetReceived) { +// TODO(b/145684124) Re-enable. +TEST_P(QuicSpdyStreamTest, DISABLED_StreamCancellationOnResetReceived) { if (!UsesHttp3()) { return; }