| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 "base/scoped_ptr.h" | 7 #include "base/scoped_ptr.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/field_trial.h" | 9 #include "base/field_trial.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 } | 665 } |
| 666 } else { | 666 } else { |
| 667 result = ReconsiderProxyAfterError(result); | 667 result = ReconsiderProxyAfterError(result); |
| 668 } | 668 } |
| 669 return result; | 669 return result; |
| 670 } | 670 } |
| 671 | 671 |
| 672 int HttpNetworkTransaction::DoSSLConnect() { | 672 int HttpNetworkTransaction::DoSSLConnect() { |
| 673 next_state_ = STATE_SSL_CONNECT_COMPLETE; | 673 next_state_ = STATE_SSL_CONNECT_COMPLETE; |
| 674 | 674 |
| 675 if (request_->load_flags & LOAD_VERIFY_EV_CERT) |
| 676 ssl_config_.verify_ev_cert = true; |
| 677 |
| 675 // Add a SSL socket on top of our existing transport socket. | 678 // Add a SSL socket on top of our existing transport socket. |
| 676 ClientSocket* s = connection_.release_socket(); | 679 ClientSocket* s = connection_.release_socket(); |
| 677 s = socket_factory_->CreateSSLClientSocket( | 680 s = socket_factory_->CreateSSLClientSocket( |
| 678 s, request_->url.HostNoBrackets(), ssl_config_); | 681 s, request_->url.HostNoBrackets(), ssl_config_); |
| 679 connection_.set_socket(s); | 682 connection_.set_socket(s); |
| 680 return connection_.socket()->Connect(&io_callback_); | 683 return connection_.socket()->Connect(&io_callback_); |
| 681 } | 684 } |
| 682 | 685 |
| 683 int HttpNetworkTransaction::DoSSLConnectComplete(int result) { | 686 int HttpNetworkTransaction::DoSSLConnectComplete(int result) { |
| 684 if (IsCertificateError(result)) | 687 if (IsCertificateError(result)) |
| (...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1756 host_and_port = proxy_info_.proxy_server().host_and_port(); | 1759 host_and_port = proxy_info_.proxy_server().host_and_port(); |
| 1757 } else { | 1760 } else { |
| 1758 DCHECK(target == HttpAuth::AUTH_SERVER); | 1761 DCHECK(target == HttpAuth::AUTH_SERVER); |
| 1759 host_and_port = GetHostAndPort(request_->url); | 1762 host_and_port = GetHostAndPort(request_->url); |
| 1760 } | 1763 } |
| 1761 auth_info->host_and_port = ASCIIToWide(host_and_port); | 1764 auth_info->host_and_port = ASCIIToWide(host_and_port); |
| 1762 response_.auth_challenge = auth_info; | 1765 response_.auth_challenge = auth_info; |
| 1763 } | 1766 } |
| 1764 | 1767 |
| 1765 } // namespace net | 1768 } // namespace net |
| OLD | NEW |