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

Side by Side Diff: net/http/http_server_properties.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 unified diff | Download patch
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_server_properties.h" 5 #include "net/http/http_server_properties.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram_macros.h" 8 #include "base/metrics/histogram_macros.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "net/socket/ssl_client_socket.h" 10 #include "net/socket/ssl_client_socket.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 host.c_str(), port); 102 host.c_str(), port);
103 } 103 }
104 104
105 std::string AlternativeServiceInfo::ToString() const { 105 std::string AlternativeServiceInfo::ToString() const {
106 return base::StringPrintf("%s, p=%f", alternative_service.ToString().c_str(), 106 return base::StringPrintf("%s, p=%f", alternative_service.ToString().c_str(),
107 probability); 107 probability);
108 } 108 }
109 109
110 // static 110 // static
111 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) { 111 void HttpServerProperties::ForceHTTP11(SSLConfig* ssl_config) {
112 ssl_config->next_protos.clear(); 112 ssl_config->alpn_protos.clear();
113 ssl_config->next_protos.push_back(kProtoHTTP11); 113 ssl_config->alpn_protos.push_back(kProtoHTTP11);
114 ssl_config->npn_protos.clear();
115 ssl_config->npn_protos.push_back(kProtoHTTP11);
114 } 116 }
115 117
116 } // namespace net 118 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698