Chromium Code Reviews

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

Issue 2210693002: 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: Created 4 years, 4 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 178 matching lines...)
189 enable_quic(false), 189 enable_quic(false),
190 quic_max_server_configs_stored_in_properties(0), 190 quic_max_server_configs_stored_in_properties(0),
191 quic_delay_tcp_race(true), 191 quic_delay_tcp_race(true),
192 quic_max_number_of_lossy_connections(0), 192 quic_max_number_of_lossy_connections(0),
193 quic_prefer_aes(false), 193 quic_prefer_aes(false),
194 quic_packet_loss_threshold(1.0f), 194 quic_packet_loss_threshold(1.0f),
195 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds), 195 quic_idle_connection_timeout_seconds(kIdleConnectionTimeoutSeconds),
196 quic_close_sessions_on_ip_change(false), 196 quic_close_sessions_on_ip_change(false),
197 quic_migrate_sessions_on_network_change(false), 197 quic_migrate_sessions_on_network_change(false),
198 quic_migrate_sessions_early(false), 198 quic_migrate_sessions_early(false),
199 quic_disable_bidirectional_streams(false), 199 quic_disable_bidirectional_streams(false) {}
200 quic_race_cert_verification(false) {}
201 200
202 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() 201 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
203 {} 202 {}
204 203
205 URLRequestContextBuilder::URLRequestContextBuilder() 204 URLRequestContextBuilder::URLRequestContextBuilder()
206 : data_enabled_(false), 205 : data_enabled_(false),
207 #if !defined(DISABLE_FILE_SUPPORT) 206 #if !defined(DISABLE_FILE_SUPPORT)
208 file_enabled_(false), 207 file_enabled_(false),
209 #endif 208 #endif
210 #if !defined(DISABLE_FTP_SUPPORT) 209 #if !defined(DISABLE_FTP_SUPPORT)
(...skipping 238 matching lines...)
449 network_session_params.quic_migrate_sessions_on_network_change = 448 network_session_params.quic_migrate_sessions_on_network_change =
450 http_network_session_params_.quic_migrate_sessions_on_network_change; 449 http_network_session_params_.quic_migrate_sessions_on_network_change;
451 network_session_params.quic_user_agent_id = 450 network_session_params.quic_user_agent_id =
452 http_network_session_params_.quic_user_agent_id; 451 http_network_session_params_.quic_user_agent_id;
453 network_session_params.quic_prefer_aes = 452 network_session_params.quic_prefer_aes =
454 http_network_session_params_.quic_prefer_aes; 453 http_network_session_params_.quic_prefer_aes;
455 network_session_params.quic_migrate_sessions_early = 454 network_session_params.quic_migrate_sessions_early =
456 http_network_session_params_.quic_migrate_sessions_early; 455 http_network_session_params_.quic_migrate_sessions_early;
457 network_session_params.quic_disable_bidirectional_streams = 456 network_session_params.quic_disable_bidirectional_streams =
458 http_network_session_params_.quic_disable_bidirectional_streams; 457 http_network_session_params_.quic_disable_bidirectional_streams;
459 network_session_params.quic_race_cert_verification =
460 http_network_session_params_.quic_race_cert_verification;
461 if (proxy_delegate_) { 458 if (proxy_delegate_) {
462 network_session_params.proxy_delegate = proxy_delegate_.get(); 459 network_session_params.proxy_delegate = proxy_delegate_.get();
463 storage->set_proxy_delegate(std::move(proxy_delegate_)); 460 storage->set_proxy_delegate(std::move(proxy_delegate_));
464 } 461 }
465 if (socket_performance_watcher_factory_) { 462 if (socket_performance_watcher_factory_) {
466 network_session_params.socket_performance_watcher_factory = 463 network_session_params.socket_performance_watcher_factory =
467 socket_performance_watcher_factory_; 464 socket_performance_watcher_factory_;
468 } 465 }
469 466
470 storage->set_http_network_session( 467 storage->set_http_network_session(
(...skipping 65 matching lines...)
536 } 533 }
537 url_request_interceptors_.clear(); 534 url_request_interceptors_.clear();
538 } 535 }
539 storage->set_job_factory(std::move(top_job_factory)); 536 storage->set_job_factory(std::move(top_job_factory));
540 // TODO(willchan): Support sdch. 537 // TODO(willchan): Support sdch.
541 538
542 return std::move(context); 539 return std::move(context);
543 } 540 }
544 541
545 } // namespace net 542 } // 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