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

Side by Side Diff: net/http/http_stream_request.cc

Issue 3107030: Address post-review comments on r56727. (Closed)
Patch Set: Created 10 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
« net/base/ssl_config_service.h ('K') | « net/base/ssl_config_service.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_stream_request.h" 5 #include "net/http/http_stream_request.h"
6 6
7 #include "base/stl_util-inl.h" 7 #include "base/stl_util-inl.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "net/base/connection_type_histograms.h" 10 #include "net/base/connection_type_histograms.h"
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 513
514 UMA_HISTOGRAM_ENUMERATION("Net.ConnectionUsedSSLv3Fallback", 514 UMA_HISTOGRAM_ENUMERATION("Net.ConnectionUsedSSLv3Fallback",
515 static_cast<int>(ssl_config()->ssl3_fallback), 2); 515 static_cast<int>(ssl_config()->ssl3_fallback), 2);
516 516
517 int load_flags = request_info().load_flags; 517 int load_flags = request_info().load_flags;
518 if (factory_->ignore_certificate_errors()) 518 if (factory_->ignore_certificate_errors())
519 load_flags |= LOAD_IGNORE_ALL_CERT_ERRORS; 519 load_flags |= LOAD_IGNORE_ALL_CERT_ERRORS;
520 if (request_info().load_flags & LOAD_VERIFY_EV_CERT) 520 if (request_info().load_flags & LOAD_VERIFY_EV_CERT)
521 ssl_config()->verify_ev_cert = true; 521 ssl_config()->verify_ev_cert = true;
522 522
523 if (proxy_info()->proxy_server().scheme() == ProxyServer::SCHEME_HTTP) 523 if (proxy_info()->proxy_server().scheme() == ProxyServer::SCHEME_HTTP ||
524 proxy_info()->proxy_server().scheme() == ProxyServer::SCHEME_HTTPS) {
524 ssl_config()->mitm_proxies_allowed = true; 525 ssl_config()->mitm_proxies_allowed = true;
526 }
525 527
526 scoped_refptr<SSLSocketParams> ssl_params = 528 scoped_refptr<SSLSocketParams> ssl_params =
527 new SSLSocketParams(tcp_params, http_proxy_params, socks_params, 529 new SSLSocketParams(tcp_params, http_proxy_params, socks_params,
528 proxy_info()->proxy_server().scheme(), 530 proxy_info()->proxy_server().scheme(),
529 request_info().url.HostNoBrackets(), *ssl_config(), 531 request_info().url.HostNoBrackets(), *ssl_config(),
530 load_flags, 532 load_flags,
531 force_spdy_always_ && force_spdy_over_ssl_, 533 force_spdy_always_ && force_spdy_over_ssl_,
532 want_spdy_over_npn); 534 want_spdy_over_npn);
533 535
534 scoped_refptr<SSLClientSocketPool> ssl_pool; 536 scoped_refptr<SSLClientSocketPool> ssl_pool;
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 100); 912 100);
911 break; 913 break;
912 default: 914 default:
913 NOTREACHED(); 915 NOTREACHED();
914 break; 916 break;
915 } 917 }
916 } 918 }
917 919
918 } // namespace net 920 } // namespace net
919 921
OLDNEW
« net/base/ssl_config_service.h ('K') | « net/base/ssl_config_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698