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

Side by Side Diff: chrome/browser/net/preconnect.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 | « no previous file | chrome/browser/resources/net_internals/spdy_view.html » ('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 "chrome/browser/net/preconnect.h" 5 #include "chrome/browser/net/preconnect.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 break; 96 break;
97 default: 97 default:
98 // Other motivations should never happen here. 98 // Other motivations should never happen here.
99 NOTREACHED(); 99 NOTREACHED();
100 break; 100 break;
101 } 101 }
102 102
103 // Setup the SSL Configuration. 103 // Setup the SSL Configuration.
104 net::SSLConfig ssl_config; 104 net::SSLConfig ssl_config;
105 session->ssl_config_service()->GetSSLConfig(&ssl_config); 105 session->ssl_config_service()->GetSSLConfig(&ssl_config);
106 session->GetNextProtos(&ssl_config.next_protos); 106 session->GetAlpnProtos(&ssl_config.alpn_protos);
107 session->GetNpnProtos(&ssl_config.npn_protos);
107 108
108 // All preconnects should perform EV certificate verification. 109 // All preconnects should perform EV certificate verification.
109 ssl_config.verify_ev_cert = true; 110 ssl_config.verify_ev_cert = true;
110 111
111 net::HttpStreamFactory* http_stream_factory = session->http_stream_factory(); 112 net::HttpStreamFactory* http_stream_factory = session->http_stream_factory();
112 http_stream_factory->PreconnectStreams(count, request_info, ssl_config, 113 http_stream_factory->PreconnectStreams(count, request_info, ssl_config,
113 ssl_config); 114 ssl_config);
114 } 115 }
115 116
116 } // namespace chrome_browser_net 117 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/net_internals/spdy_view.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698