Remove use of illegal ":version" HTTP pseudo-header in tests
According to the specs, implementations of HTTP/2 and HTTP/3 MUST NOT send any header whose name starts with a colon (":") except for ":method", ":scheme", ":authority", and ":path".
(Not to mention the fact that HTTP/1.1 is not the correct version of HTTP being used here...)
https://tools.ietf.org/html/draft-ietf-quic-http-24#section-4.1.1
https://tools.ietf.org/html/rfc7540#section-8.1.2.1
gfe-relnote: n/a, test-only change
PiperOrigin-RevId: 281059854
Change-Id: Ic8e7422c8f65c2f702eb899b73dcbd302e9ab945
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index 76b4b33..01595c9 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -3120,7 +3120,6 @@
SpdyHeaderBlock headers;
headers[":status"] = "200";
- headers[":version"] = "HTTP/1.1";
headers["content-length"] = QuicTextUtils::Uint64ToString(kBody.size());
SpdyHeaderBlock trailers;
@@ -3174,7 +3173,6 @@
? large_resource
: QuicStrCat("This is server push response body for ", url);
SpdyHeaderBlock response_headers;
- response_headers[":version"] = "HTTP/1.1";
response_headers[":status"] = "200";
response_headers["content-length"] =
QuicTextUtils::Uint64ToString(body.size());
diff --git a/quic/core/http/quic_client_promised_info_test.cc b/quic/core/http/quic_client_promised_info_test.cc
index e244fcf..27d9fe8 100644
--- a/quic/core/http/quic_client_promised_info_test.cc
+++ b/quic/core/http/quic_client_promised_info_test.cc
@@ -89,7 +89,6 @@
push_promise_[":path"] = "/bar";
push_promise_[":authority"] = "www.google.com";
- push_promise_[":version"] = "HTTP/1.1";
push_promise_[":method"] = "GET";
push_promise_[":scheme"] = "https";
diff --git a/quic/core/http/quic_client_push_promise_index_test.cc b/quic/core/http/quic_client_push_promise_index_test.cc
index 933ef6b..3ca377e 100644
--- a/quic/core/http/quic_client_push_promise_index_test.cc
+++ b/quic/core/http/quic_client_push_promise_index_test.cc
@@ -60,7 +60,6 @@
url_) {
request_[":path"] = "/bar";
request_[":authority"] = "www.google.com";
- request_[":version"] = "HTTP/1.1";
request_[":method"] = "GET";
request_[":scheme"] = "https";
url_ = SpdyServerPushUtils::GetPromisedUrlFromHeaders(request_);
diff --git a/quic/core/http/quic_headers_stream_test.cc b/quic/core/http/quic_headers_stream_test.cc
index 2e6b729..973c60c 100644
--- a/quic/core/http/quic_headers_stream_test.cc
+++ b/quic/core/http/quic_headers_stream_test.cc
@@ -199,7 +199,6 @@
QuicSpdySessionPeer::SetMaxInboundHeaderListSize(&session_, 256 * 1024);
session_.Initialize();
headers_stream_ = QuicSpdySessionPeer::GetHeadersStream(&session_);
- headers_[":version"] = "HTTP/1.1";
headers_[":status"] = "200 Ok";
headers_["content-length"] = "11";
framer_ = std::unique_ptr<SpdyFramer>(
diff --git a/quic/core/http/quic_spdy_client_session_test.cc b/quic/core/http/quic_spdy_client_session_test.cc
index 9ab462d..7c4d914 100644
--- a/quic/core/http/quic_spdy_client_session_test.cc
+++ b/quic/core/http/quic_spdy_client_session_test.cc
@@ -107,7 +107,6 @@
session_->Initialize();
push_promise_[":path"] = "/bar";
push_promise_[":authority"] = "www.google.com";
- push_promise_[":version"] = "HTTP/1.1";
push_promise_[":method"] = "GET";
push_promise_[":scheme"] = "https";
promise_url_ =
@@ -621,7 +620,6 @@
headers.OnHeaderBlockStart();
headers.OnHeader(":path", "/bar");
headers.OnHeader(":authority", "www.google.com");
- headers.OnHeader(":version", "HTTP/1.1");
headers.OnHeader(":method", "GET");
headers.OnHeader(":scheme", "https");
headers.OnHeaderBlockEnd(0, 0);
@@ -927,7 +925,6 @@
headers.OnHeaderBlockStart();
headers.OnHeader(":path", QuicStrCat("/", promise_count));
headers.OnHeader(":authority", "www.google.com");
- headers.OnHeader(":version", "HTTP/1.1");
headers.OnHeader(":method", "GET");
headers.OnHeader(":scheme", "https");
headers.OnHeaderBlockEnd(0, 0);
diff --git a/quic/tools/quic_memory_cache_backend.cc b/quic/tools/quic_memory_cache_backend.cc
index 6452d22..38d25e5 100644
--- a/quic/tools/quic_memory_cache_backend.cc
+++ b/quic/tools/quic_memory_cache_backend.cc
@@ -289,7 +289,6 @@
QuicWriterMutexLock lock(&response_mutex_);
// Add a generate bytes response.
spdy::SpdyHeaderBlock response_headers;
- response_headers[":version"] = "HTTP/1.1";
response_headers[":status"] = "200";
generate_bytes_response_ = std::make_unique<QuicBackendResponse>();
generate_bytes_response_->set_headers(std::move(response_headers));
diff --git a/quic/tools/quic_memory_cache_backend_test.cc b/quic/tools/quic_memory_cache_backend_test.cc
index 80b1b29..01ac334 100644
--- a/quic/tools/quic_memory_cache_backend_test.cc
+++ b/quic/tools/quic_memory_cache_backend_test.cc
@@ -59,7 +59,6 @@
const std::string kResponseBody("hello response");
spdy::SpdyHeaderBlock response_headers;
- response_headers[":version"] = "HTTP/1.1";
response_headers[":status"] = "200";
response_headers["content-length"] =
QuicTextUtils::Uint64ToString(kResponseBody.size());
@@ -123,7 +122,6 @@
// Add a default response.
spdy::SpdyHeaderBlock response_headers;
- response_headers[":version"] = "HTTP/1.1";
response_headers[":status"] = "200";
response_headers["content-length"] = "0";
Response* default_response = new Response;
@@ -164,7 +162,6 @@
std::string body =
QuicStrCat("This is server push response body for ", path);
spdy::SpdyHeaderBlock response_headers;
- response_headers[":version"] = "HTTP/1.1";
response_headers[":status"] = "200";
response_headers["content-length"] =
QuicTextUtils::Uint64ToString(body.size());
@@ -203,7 +200,6 @@
QuicUrl resource_url(url);
std::string body = "This is server push response body for " + path;
spdy::SpdyHeaderBlock response_headers;
- response_headers[":version"] = "HTTP/1.1";
response_headers[":status"] = push_response_status[i];
response_headers["content-length"] =
QuicTextUtils::Uint64ToString(body.size());
diff --git a/quic/tools/quic_simple_server_stream_test.cc b/quic/tools/quic_simple_server_stream_test.cc
index 41ea2f6..587bc28 100644
--- a/quic/tools/quic_simple_server_stream_test.cc
+++ b/quic/tools/quic_simple_server_stream_test.cc
@@ -193,7 +193,6 @@
header_list_.OnHeader(":authority", "www.google.com");
header_list_.OnHeader(":path", "/");
header_list_.OnHeader(":method", "POST");
- header_list_.OnHeader(":version", "HTTP/1.1");
header_list_.OnHeader("content-length", "11");
header_list_.OnHeaderBlockEnd(128, 128);
@@ -345,10 +344,8 @@
spdy::SpdyHeaderBlock* request_headers = stream_->mutable_headers();
(*request_headers)[":path"] = "/bar";
(*request_headers)[":authority"] = "www.google.com";
- (*request_headers)[":version"] = "HTTP/1.1";
(*request_headers)[":method"] = "GET";
- response_headers_[":version"] = "HTTP/1.1";
// HTTP/2 only supports integer responsecode, so "200 OK" is illegal.
response_headers_[":status"] = "200 OK";
response_headers_["content-length"] = "5";
@@ -379,10 +376,8 @@
spdy::SpdyHeaderBlock* request_headers = stream_->mutable_headers();
(*request_headers)[":path"] = "/bar";
(*request_headers)[":authority"] = "www.google.com";
- (*request_headers)[":version"] = "HTTP/1.1";
(*request_headers)[":method"] = "GET";
- response_headers_[":version"] = "HTTP/1.1";
// HTTP/2 only supports 3-digit-integer, so "+200" is illegal.
response_headers_[":status"] = "+200";
response_headers_["content-length"] = "5";
@@ -422,10 +417,8 @@
spdy::SpdyHeaderBlock* request_headers = promised_stream->mutable_headers();
(*request_headers)[":path"] = "/bar";
(*request_headers)[":authority"] = "www.google.com";
- (*request_headers)[":version"] = "HTTP/1.1";
(*request_headers)[":method"] = "GET";
- response_headers_[":version"] = "HTTP/1.1";
response_headers_[":status"] = "404";
response_headers_["content-length"] = "8";
std::string body = "NotFound";
@@ -445,10 +438,8 @@
spdy::SpdyHeaderBlock* request_headers = stream_->mutable_headers();
(*request_headers)[":path"] = "/bar";
(*request_headers)[":authority"] = "www.google.com";
- (*request_headers)[":version"] = "HTTP/1.1";
(*request_headers)[":method"] = "GET";
- response_headers_[":version"] = "HTTP/1.1";
response_headers_[":status"] = "200";
response_headers_["content-length"] = "5";
std::string body = "Yummm";
@@ -495,7 +486,6 @@
spdy::SpdyHeaderBlock* request_headers = stream_->mutable_headers();
(*request_headers)[":path"] = request_path;
(*request_headers)[":authority"] = host;
- (*request_headers)[":version"] = "HTTP/1.1";
(*request_headers)[":method"] = "GET";
stream_->set_fin_received(true);
@@ -546,10 +536,8 @@
spdy::SpdyHeaderBlock headers;
headers[":path"] = kPath;
headers[":authority"] = kHost;
- headers[":version"] = "HTTP/1.1";
headers[":method"] = "GET";
- response_headers_[":version"] = "HTTP/1.1";
response_headers_[":status"] = "200";
response_headers_["content-length"] = "5";
const std::string kBody = "Hello";
