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

Unified Diff: net/log/net_log_util.cc

Issue 1387363004: Disable HTTP/2 over NPN (with OpenSSL). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: #7. Created 5 years, 2 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_stream_factory_impl_job.cc ('k') | net/socket/socket_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/log/net_log_util.cc
diff --git a/net/log/net_log_util.cc b/net/log/net_log_util.cc
index 46282f7df0ba53f535a3530c125a2dbcd9e399f1..43805a86b0d9eafb28437c0405fb9d528e6f9d2e 100644
--- a/net/log/net_log_util.cc
+++ b/net/log/net_log_util.cc
@@ -420,16 +420,28 @@ NET_EXPORT scoped_ptr<base::DictionaryValue> GetNetInfo(
"use_alternative_services",
http_network_session->params().use_alternative_services);
- NextProtoVector next_protos;
- http_network_session->GetNextProtos(&next_protos);
- if (!next_protos.empty()) {
+ NextProtoVector alpn_protos;
+ http_network_session->GetAlpnProtos(&alpn_protos);
+ if (!alpn_protos.empty()) {
std::string next_protos_string;
- for (const NextProto proto : next_protos) {
+ for (NextProto proto : alpn_protos) {
if (!next_protos_string.empty())
next_protos_string.append(",");
next_protos_string.append(SSLClientSocket::NextProtoToString(proto));
}
- status_dict->SetString("next_protos", next_protos_string);
+ status_dict->SetString("alpn_protos", next_protos_string);
+ }
+
+ NextProtoVector npn_protos;
+ http_network_session->GetNpnProtos(&npn_protos);
+ if (!npn_protos.empty()) {
+ std::string next_protos_string;
+ for (NextProto proto : npn_protos) {
+ if (!next_protos_string.empty())
+ next_protos_string.append(",");
+ next_protos_string.append(SSLClientSocket::NextProtoToString(proto));
+ }
+ status_dict->SetString("npn_protos", next_protos_string);
}
net_info_dict->Set(NetInfoSourceToString(NET_INFO_SPDY_STATUS),
« no previous file with comments | « net/http/http_stream_factory_impl_job.cc ('k') | net/socket/socket_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698