| OLD | NEW |
| 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_network_transaction.h" | 5 #include "net/http/http_network_transaction.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 | 798 |
| 799 int load_flags = request_->load_flags; | 799 int load_flags = request_->load_flags; |
| 800 if (g_ignore_certificate_errors) | 800 if (g_ignore_certificate_errors) |
| 801 load_flags |= LOAD_IGNORE_ALL_CERT_ERRORS; | 801 load_flags |= LOAD_IGNORE_ALL_CERT_ERRORS; |
| 802 if (request_->load_flags & LOAD_VERIFY_EV_CERT) | 802 if (request_->load_flags & LOAD_VERIFY_EV_CERT) |
| 803 ssl_config_.verify_ev_cert = true; | 803 ssl_config_.verify_ev_cert = true; |
| 804 | 804 |
| 805 scoped_refptr<SSLSocketParams> ssl_params = | 805 scoped_refptr<SSLSocketParams> ssl_params = |
| 806 new SSLSocketParams(tcp_params, http_proxy_params, socks_params, | 806 new SSLSocketParams(tcp_params, http_proxy_params, socks_params, |
| 807 proxy_info_.proxy_server().scheme(), | 807 proxy_info_.proxy_server().scheme(), |
| 808 request_->url.HostNoBrackets(), ssl_config_, | 808 endpoint_, ssl_config_, |
| 809 load_flags, | 809 load_flags, |
| 810 want_spdy_without_npn_ && | 810 want_spdy_without_npn_ && |
| 811 want_ssl_over_spdy_without_npn_, | 811 want_ssl_over_spdy_without_npn_, |
| 812 want_spdy_over_npn); | 812 want_spdy_over_npn); |
| 813 | 813 |
| 814 scoped_refptr<SSLClientSocketPool> ssl_pool; | 814 scoped_refptr<SSLClientSocketPool> ssl_pool; |
| 815 if (proxy_info_.is_direct()) | 815 if (proxy_info_.is_direct()) |
| 816 ssl_pool = session_->ssl_socket_pool(); | 816 ssl_pool = session_->ssl_socket_pool(); |
| 817 else | 817 else |
| 818 ssl_pool = session_->GetSocketPoolForSSLWithProxy(*proxy_host_port); | 818 ssl_pool = session_->GetSocketPoolForSSLWithProxy(*proxy_host_port); |
| (...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1842 default: | 1842 default: |
| 1843 return priority; | 1843 return priority; |
| 1844 } | 1844 } |
| 1845 } | 1845 } |
| 1846 | 1846 |
| 1847 | 1847 |
| 1848 | 1848 |
| 1849 #undef STATE_CASE | 1849 #undef STATE_CASE |
| 1850 | 1850 |
| 1851 } // namespace net | 1851 } // namespace net |
| OLD | NEW |