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

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

Issue 2120703003: QUIC - Race Cert Verification with host resolution if certs are (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for buildbot failure. Created 4 years, 4 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/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...) Expand 10 before | Expand all | Expand 10 after
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) {}
200 201
201 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams() 202 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
202 {} 203 {}
203 204
204 URLRequestContextBuilder::URLRequestContextBuilder() 205 URLRequestContextBuilder::URLRequestContextBuilder()
205 : data_enabled_(false), 206 : data_enabled_(false),
206 #if !defined(DISABLE_FILE_SUPPORT) 207 #if !defined(DISABLE_FILE_SUPPORT)
207 file_enabled_(false), 208 file_enabled_(false),
208 #endif 209 #endif
209 #if !defined(DISABLE_FTP_SUPPORT) 210 #if !defined(DISABLE_FTP_SUPPORT)
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 network_session_params.quic_migrate_sessions_on_network_change = 449 network_session_params.quic_migrate_sessions_on_network_change =
449 http_network_session_params_.quic_migrate_sessions_on_network_change; 450 http_network_session_params_.quic_migrate_sessions_on_network_change;
450 network_session_params.quic_user_agent_id = 451 network_session_params.quic_user_agent_id =
451 http_network_session_params_.quic_user_agent_id; 452 http_network_session_params_.quic_user_agent_id;
452 network_session_params.quic_prefer_aes = 453 network_session_params.quic_prefer_aes =
453 http_network_session_params_.quic_prefer_aes; 454 http_network_session_params_.quic_prefer_aes;
454 network_session_params.quic_migrate_sessions_early = 455 network_session_params.quic_migrate_sessions_early =
455 http_network_session_params_.quic_migrate_sessions_early; 456 http_network_session_params_.quic_migrate_sessions_early;
456 network_session_params.quic_disable_bidirectional_streams = 457 network_session_params.quic_disable_bidirectional_streams =
457 http_network_session_params_.quic_disable_bidirectional_streams; 458 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;
458 if (proxy_delegate_) { 461 if (proxy_delegate_) {
459 network_session_params.proxy_delegate = proxy_delegate_.get(); 462 network_session_params.proxy_delegate = proxy_delegate_.get();
460 storage->set_proxy_delegate(std::move(proxy_delegate_)); 463 storage->set_proxy_delegate(std::move(proxy_delegate_));
461 } 464 }
462 if (socket_performance_watcher_factory_) { 465 if (socket_performance_watcher_factory_) {
463 network_session_params.socket_performance_watcher_factory = 466 network_session_params.socket_performance_watcher_factory =
464 socket_performance_watcher_factory_; 467 socket_performance_watcher_factory_;
465 } 468 }
466 469
467 storage->set_http_network_session( 470 storage->set_http_network_session(
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 } 536 }
534 url_request_interceptors_.clear(); 537 url_request_interceptors_.clear();
535 } 538 }
536 storage->set_job_factory(std::move(top_job_factory)); 539 storage->set_job_factory(std::move(top_job_factory));
537 // TODO(willchan): Support sdch. 540 // TODO(willchan): Support sdch.
538 541
539 return std::move(context); 542 return std::move(context);
540 } 543 }
541 544
542 } // namespace net 545 } // 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
This is Rietveld 408576698