Do not reset stream if HTTP/2 response contains status text.
* Do not reset stream if HTTP/2 response contains status text.
* Add unittest for this.
* Add histogram for HTTP/2 response ":status" header field format.
BUG=672065
Review-Url: https://codereview.chromium.org/2555183002
Cr-Commit-Position: refs/heads/master@{#437111}
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc
index c413ef65..c41a975 100644
--- a/net/spdy/spdy_stream_unittest.cc
+++ b/net/spdy/spdy_stream_unittest.cc
@@ -1048,7 +1048,7 @@
EXPECT_TRUE(data.AllReadDataConsumed());
}
-TEST_F(SpdyStreamTest, StatusMustBeNumber) {
+TEST_F(SpdyStreamTest, StatusMustStartWithNumber) {
SpdySerializedFrame req(
spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
AddWrite(req);
@@ -1095,6 +1095,58 @@
EXPECT_TRUE(data.AllReadDataConsumed());
}
+TEST_F(SpdyStreamTest, StatusCanHaveExtraText) {
+ SpdySerializedFrame req(
+ spdy_util_.ConstructSpdyGet(nullptr, 0, 1, LOWEST, true));
+ AddWrite(req);
+
+ SpdyHeaderBlock headers_with_status_text;
+ headers_with_status_text[":status"] =
+ "200 Some random extra text describing status";
+ SpdySerializedFrame reply(spdy_util_.ConstructSpdyResponseHeaders(
+ 1, std::move(headers_with_status_text), false));
+ AddRead(reply);
+
+ SpdySerializedFrame body(
+ spdy_util_.ConstructSpdyDataFrame(1, kPostBody, kPostBodyLength, true));
+ AddRead(body);
+
+ AddReadEOF();
+
+ SequencedSocketData data(GetReads(), GetNumReads(), GetWrites(),
+ GetNumWrites());
+ MockConnect connect_data(SYNCHRONOUS, OK);
+ data.set_connect_data(connect_data);
+ session_deps_.socket_factory->AddSocketDataProvider(&data);
+
+ AddSSLSocketData();
+
+ base::WeakPtr<SpdySession> session(CreateDefaultSpdySession());
+
+ base::WeakPtr<SpdyStream> stream = CreateStreamSynchronously(
+ SPDY_REQUEST_RESPONSE_STREAM, session, url_, LOWEST, NetLogWithSource());
+ ASSERT_TRUE(stream);
+
+ StreamDelegateDoNothing delegate(stream);
+ stream->SetDelegate(&delegate);
+
+ EXPECT_TRUE(stream->GetUrlFromHeaders().is_empty());
+
+ SpdyHeaderBlock headers(spdy_util_.ConstructGetHeaderBlock(kDefaultUrl));
+ EXPECT_EQ(ERR_IO_PENDING, stream->SendRequestHeaders(std::move(headers),
+ NO_MORE_DATA_TO_SEND));
+ EXPECT_EQ(kDefaultUrl, stream->GetUrlFromHeaders().spec());
+
+ EXPECT_THAT(delegate.WaitForClose(), IsOk());
+ EXPECT_EQ("200 Some random extra text describing status",
+ delegate.GetResponseHeaderValue(spdy_util_.GetStatusKey()));
+ EXPECT_EQ(std::string(kPostBody, kPostBodyLength),
+ delegate.TakeReceivedData());
+
+ EXPECT_TRUE(data.AllWriteDataConsumed());
+ EXPECT_TRUE(data.AllReadDataConsumed());
+}
+
// Call IncreaseSendWindowSize on a stream with a large enough delta to overflow
// an int32_t. The SpdyStream should handle that case gracefully.
TEST_F(SpdyStreamTest, IncreaseSendWindowSizeOverflow) {
