Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1137)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 2115213002: Disable SPDY/3.1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/log/net_log_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_unittest.cc
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 76bb795e738dc35703ba1b7a9ca7f4947e69a88d..480786efb6c0a44bf10ab3f6a152033ab9f013fb 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -133,6 +133,9 @@ const base::string16 kSecond(ASCIIToUTF16("second"));
const base::string16 kTestingNTLM(ASCIIToUTF16("testing-ntlm"));
const base::string16 kWrongPassword(ASCIIToUTF16("wrongpassword"));
+const char kAlternativeServiceHttpHeader[] =
+ "Alt-Svc: npn-h2=\"mail.example.org:443\"\r\n";
Ryan Hamilton 2016/07/06 19:24:58 Is "npn-h2" the right header?
Bence 2016/07/07 16:20:41 I was wondering about the same. Filed https://crb
+
int GetIdleSocketCountInTransportSocketPool(HttpNetworkSession* session) {
return session->GetTransportSocketPool(HttpNetworkSession::NORMAL_SOCKET_POOL)
->IdleSocketCount();
@@ -326,16 +329,6 @@ class HttpNetworkTransactionTest
return GetParam() == kTestCaseHTTP2PriorityDependencies;
}
- const char* GetAlternateProtocolFromParam() {
- return AlternateProtocolToString(
- AlternateProtocolFromNextProto(GetProtocol()));
- }
-
- std::string GetAlternativeServiceHttpHeader() {
- return std::string("Alt-Svc: ") + GetAlternateProtocolFromParam() +
- "=\"mail.example.org:443\"\r\n";
- }
-
// Either |write_failure| specifies a write failure or |read_failure|
// specifies a read failure when using a reused socket. In either case, the
// failure should cause the network transaction to resend the request, and the
@@ -9947,12 +9940,14 @@ TEST_P(HttpNetworkTransactionTest, ChangeAuthRealms) {
}
TEST_P(HttpNetworkTransactionTest, HonorAlternativeServiceHeader) {
- std::string alternative_service_http_header =
- GetAlternativeServiceHttpHeader();
+ // SPDY/3.1 is not supported.
+ if (GetProtocol() != kProtoHTTP2) {
+ return;
+ }
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
- MockRead(alternative_service_http_header.c_str()),
+ MockRead(kAlternativeServiceHttpHeader),
MockRead("\r\n"),
MockRead("hello world"),
MockRead(SYNCHRONOUS, OK),
@@ -10010,12 +10005,9 @@ TEST_P(HttpNetworkTransactionTest, HonorAlternativeServiceHeader) {
// Regression test for https://crbug.com/615497.
TEST_P(HttpNetworkTransactionTest,
DoNotParseAlternativeServiceHeaderOnInsecureRequest) {
- std::string alternative_service_http_header =
- GetAlternativeServiceHttpHeader();
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
- MockRead(alternative_service_http_header.c_str()),
+ MockRead(kAlternativeServiceHttpHeader),
MockRead("\r\n"),
MockRead("hello world"),
MockRead(SYNCHRONOUS, OK),
@@ -10209,13 +10201,15 @@ TEST_P(HttpNetworkTransactionTest, ClearAlternativeServices) {
}
TEST_P(HttpNetworkTransactionTest, HonorMultipleAlternativeServiceHeaders) {
+ // SPDY/3.1 is not supported.
+ if (GetProtocol() != kProtoHTTP2) {
+ return;
+ }
+
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
- MockRead("Alt-Svc: "),
- MockRead(GetAlternateProtocolFromParam()),
- MockRead("=\"www.example.com:443\","),
- MockRead(GetAlternateProtocolFromParam()),
- MockRead("=\":1234\"\r\n\r\n"),
+ MockRead("Alt-Svc: npn-h2=\"www.example.com:443\","),
+ MockRead("npn-h2=\":1234\"\r\n\r\n"),
MockRead("hello world"),
MockRead(SYNCHRONOUS, OK),
};
@@ -10789,12 +10783,9 @@ TEST_P(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) {
request.url = GURL("https://www.example.org/");
request.load_flags = 0;
- std::string alternative_service_http_header =
- GetAlternativeServiceHttpHeader();
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
- MockRead(alternative_service_http_header.c_str()),
+ MockRead(kAlternativeServiceHttpHeader),
MockRead("\r\n"),
MockRead("hello world"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
@@ -10875,18 +10866,20 @@ TEST_P(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) {
}
TEST_P(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) {
+ // SPDY/3.1 is not supported.
+ if (GetProtocol() != kProtoHTTP2) {
+ return;
+ }
+
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("https://www.example.org/");
request.load_flags = 0;
// First transaction receives Alt-Svc header over HTTP/1.1.
- std::string alternative_service_http_header =
- GetAlternativeServiceHttpHeader();
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
- MockRead(alternative_service_http_header.c_str()),
+ MockRead(kAlternativeServiceHttpHeader),
MockRead("\r\n"),
MockRead("hello world"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
@@ -11002,17 +10995,19 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) {
}
TEST_P(HttpNetworkTransactionTest, StallAlternativeServiceForNpnSpdy) {
+ // SPDY/3.1 is not supported.
+ if (GetProtocol() != kProtoHTTP2) {
+ return;
+ }
+
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("https://www.example.org/");
request.load_flags = 0;
- std::string alternative_service_http_header =
- GetAlternativeServiceHttpHeader();
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
- MockRead(alternative_service_http_header.c_str()),
+ MockRead(kAlternativeServiceHttpHeader),
MockRead("\r\n"),
MockRead("hello world"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
@@ -11145,12 +11140,9 @@ TEST_P(HttpNetworkTransactionTest, UseAlternativeServiceForTunneledNpnSpdy) {
request.url = GURL("https://www.example.org/");
request.load_flags = 0;
- std::string alternative_service_http_header =
- GetAlternativeServiceHttpHeader();
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
- MockRead(alternative_service_http_header.c_str()),
+ MockRead(kAlternativeServiceHttpHeader),
MockRead("\r\n"),
MockRead("hello world"),
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
@@ -11259,12 +11251,9 @@ TEST_P(HttpNetworkTransactionTest,
request.url = GURL("https://www.example.org/");
request.load_flags = 0;
- std::string alternative_service_http_header =
- GetAlternativeServiceHttpHeader();
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
- MockRead(alternative_service_http_header.c_str()),
+ MockRead(kAlternativeServiceHttpHeader),
MockRead("\r\n"),
MockRead("hello world"),
MockRead(ASYNC, OK),
@@ -11970,12 +11959,9 @@ TEST_P(HttpNetworkTransactionTest, NpnWithHttpOverSSL) {
"Connection: keep-alive\r\n\r\n"),
};
- std::string alternative_service_http_header =
- GetAlternativeServiceHttpHeader();
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
- MockRead(alternative_service_http_header.c_str()),
+ MockRead(kAlternativeServiceHttpHeader),
MockRead("\r\n"),
MockRead("hello world"),
MockRead(SYNCHRONOUS, OK),
@@ -15876,9 +15862,9 @@ TEST_P(HttpNetworkTransactionTest, EnableNPN) {
trans.Start(&request, callback.callback(), BoundNetLog()));
EXPECT_THAT(trans.server_ssl_config_.alpn_protos,
- testing::ElementsAre(kProtoHTTP2, kProtoSPDY31, kProtoHTTP11));
+ testing::ElementsAre(kProtoHTTP2, kProtoHTTP11));
EXPECT_THAT(trans.server_ssl_config_.npn_protos,
- testing::ElementsAre(kProtoHTTP2, kProtoSPDY31, kProtoHTTP11));
+ testing::ElementsAre(kProtoHTTP2, kProtoHTTP11));
}
TEST_P(HttpNetworkTransactionTest, DisableNPN) {
@@ -15892,7 +15878,7 @@ TEST_P(HttpNetworkTransactionTest, DisableNPN) {
trans.Start(&request, callback.callback(), BoundNetLog()));
EXPECT_THAT(trans.server_ssl_config_.alpn_protos,
- testing::ElementsAre(kProtoHTTP2, kProtoSPDY31, kProtoHTTP11));
+ testing::ElementsAre(kProtoHTTP2, kProtoHTTP11));
EXPECT_TRUE(trans.server_ssl_config_.npn_protos.empty());
}
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/log/net_log_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698