Chromium Code Reviews

Side by Side Diff: net/url_request/url_request_context_builder.cc

Issue 2267603002: Revert of QUIC - Race Cert Verification with host resolution if certs are (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixup Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | 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/url_request/url_request_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 177 matching lines...)
188 enable_quic(false), 188 enable_quic(false),
189 quic_max_server_configs_stored_in_properties(0), 189 quic_max_server_configs_stored_in_properties(0),
190 quic_delay_tcp_race(true), 190 quic_delay_tcp_race(true),
191 quic_max_number_of_lossy_connections(0), 191 quic_max_number_of_lossy_connections(0),
192 quic_prefer_aes(false), 192 quic_prefer_aes(false),
193 quic_packet_loss_threshold(1.0f), 193 quic_packet_loss_threshold(1.0f),
194 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds), 194 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
195 quic_close_sessions_on_ip_change(false), 195 quic_close_sessions_on_ip_change(false),
196 quic_migrate_sessions_on_network_change(false), 196 quic_migrate_sessions_on_network_change(false),
197 quic_migrate_sessions_early(false), 197 quic_migrate_sessions_early(false),
198 quic_disable_bidirectional_streams(false), 198 quic_disable_bidirectional_streams(false) {}
199 quic_race_cert_verification(false) {}
200 199
201 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() 200 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
202 {} 201 {}
203 202
204 URLRequestContextBuilder::URLRequestContextBuilder() 203 URLRequestContextBuilder::URLRequestContextBuilder()
205 : data_enabled_(false), 204 : data_enabled_(false),
206 #if !defined(DISABLE_FILE_SUPPORT) 205 #if !defined(DISABLE_FILE_SUPPORT)
207 file_enabled_(false), 206 file_enabled_(false),
208 #endif 207 #endif
209 #if !defined(DISABLE_FTP_SUPPORT) 208 #if !defined(DISABLE_FTP_SUPPORT)
(...skipping 232 matching lines...)
442 network_session_params.quic_migrate_sessions_on_network_change = 441 network_session_params.quic_migrate_sessions_on_network_change =
443 http_network_session_params_.quic_migrate_sessions_on_network_change; 442 http_network_session_params_.quic_migrate_sessions_on_network_change;
444 network_session_params.quic_user_agent_id = 443 network_session_params.quic_user_agent_id =
445 http_network_session_params_.quic_user_agent_id; 444 http_network_session_params_.quic_user_agent_id;
446 network_session_params.quic_prefer_aes = 445 network_session_params.quic_prefer_aes =
447 http_network_session_params_.quic_prefer_aes; 446 http_network_session_params_.quic_prefer_aes;
448 network_session_params.quic_migrate_sessions_early = 447 network_session_params.quic_migrate_sessions_early =
449 http_network_session_params_.quic_migrate_sessions_early; 448 http_network_session_params_.quic_migrate_sessions_early;
450 network_session_params.quic_disable_bidirectional_streams = 449 network_session_params.quic_disable_bidirectional_streams =
451 http_network_session_params_.quic_disable_bidirectional_streams; 450 http_network_session_params_.quic_disable_bidirectional_streams;
452 network_session_params.quic_race_cert_verification =
453 http_network_session_params_.quic_race_cert_verification;
454 if (proxy_delegate_) { 451 if (proxy_delegate_) {
455 network_session_params.proxy_delegate = proxy_delegate_.get(); 452 network_session_params.proxy_delegate = proxy_delegate_.get();
456 storage->set_proxy_delegate(std::move(proxy_delegate_)); 453 storage->set_proxy_delegate(std::move(proxy_delegate_));
457 } 454 }
458 if (socket_performance_watcher_factory_) { 455 if (socket_performance_watcher_factory_) {
459 network_session_params.socket_performance_watcher_factory = 456 network_session_params.socket_performance_watcher_factory =
460 socket_performance_watcher_factory_; 457 socket_performance_watcher_factory_;
461 } 458 }
462 459
463 storage->set_http_network_session( 460 storage->set_http_network_session(
(...skipping 65 matching lines...)
529 } 526 }
530 url_request_interceptors_.clear(); 527 url_request_interceptors_.clear();
531 } 528 }
532 storage->set_job_factory(std::move(top_job_factory)); 529 storage->set_job_factory(std::move(top_job_factory));
533 // TODO(willchan): Support sdch. 530 // TODO(willchan): Support sdch.
534 531
535 return std::move(context); 532 return std::move(context);
536 } 533 }
537 534
538 } // namespace net 535 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine