| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/socket/ssl_client_socket_pool.h" | 5 #include "net/socket/ssl_client_socket_pool.h" |
| 6 | 6 |
| 7 #include "base/metrics/field_trial.h" | 7 #include "base/metrics/field_trial.h" |
| 8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "net/base/net_errors.h" | 10 #include "net/base/net_errors.h" |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 } | 256 } |
| 257 | 257 |
| 258 int SSLConnectJob::DoTunnelConnectComplete(int result) { | 258 int SSLConnectJob::DoTunnelConnectComplete(int result) { |
| 259 // Extract the information needed to prompt for appropriate proxy | 259 // Extract the information needed to prompt for appropriate proxy |
| 260 // authentication so that when ClientSocketPoolBaseHelper calls | 260 // authentication so that when ClientSocketPoolBaseHelper calls |
| 261 // |GetAdditionalErrorState|, we can easily set the state. | 261 // |GetAdditionalErrorState|, we can easily set the state. |
| 262 if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) { | 262 if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) { |
| 263 error_response_info_ = transport_socket_handle_->ssl_error_response_info(); | 263 error_response_info_ = transport_socket_handle_->ssl_error_response_info(); |
| 264 } else if (result == ERR_PROXY_AUTH_REQUESTED || | 264 } else if (result == ERR_PROXY_AUTH_REQUESTED || |
| 265 result == ERR_HTTPS_PROXY_TUNNEL_RESPONSE) { | 265 result == ERR_HTTPS_PROXY_TUNNEL_RESPONSE) { |
| 266 ClientSocket* socket = transport_socket_handle_->socket(); | 266 StreamSocket* socket = transport_socket_handle_->socket(); |
| 267 HttpProxyClientSocket* tunnel_socket = | 267 HttpProxyClientSocket* tunnel_socket = |
| 268 static_cast<HttpProxyClientSocket*>(socket); | 268 static_cast<HttpProxyClientSocket*>(socket); |
| 269 error_response_info_ = *tunnel_socket->GetConnectResponseInfo(); | 269 error_response_info_ = *tunnel_socket->GetConnectResponseInfo(); |
| 270 } | 270 } |
| 271 if (result < 0) | 271 if (result < 0) |
| 272 return result; | 272 return result; |
| 273 | 273 |
| 274 next_state_ = STATE_SSL_CONNECT; | 274 next_state_ = STATE_SSL_CONNECT; |
| 275 return result; | 275 return result; |
| 276 } | 276 } |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 507 | 507 |
| 508 base_.RequestSockets(group_name, *casted_params, num_sockets, net_log); | 508 base_.RequestSockets(group_name, *casted_params, num_sockets, net_log); |
| 509 } | 509 } |
| 510 | 510 |
| 511 void SSLClientSocketPool::CancelRequest(const std::string& group_name, | 511 void SSLClientSocketPool::CancelRequest(const std::string& group_name, |
| 512 ClientSocketHandle* handle) { | 512 ClientSocketHandle* handle) { |
| 513 base_.CancelRequest(group_name, handle); | 513 base_.CancelRequest(group_name, handle); |
| 514 } | 514 } |
| 515 | 515 |
| 516 void SSLClientSocketPool::ReleaseSocket(const std::string& group_name, | 516 void SSLClientSocketPool::ReleaseSocket(const std::string& group_name, |
| 517 ClientSocket* socket, int id) { | 517 StreamSocket* socket, int id) { |
| 518 base_.ReleaseSocket(group_name, socket, id); | 518 base_.ReleaseSocket(group_name, socket, id); |
| 519 } | 519 } |
| 520 | 520 |
| 521 void SSLClientSocketPool::Flush() { | 521 void SSLClientSocketPool::Flush() { |
| 522 base_.Flush(); | 522 base_.Flush(); |
| 523 } | 523 } |
| 524 | 524 |
| 525 void SSLClientSocketPool::CloseIdleSockets() { | 525 void SSLClientSocketPool::CloseIdleSockets() { |
| 526 base_.CloseIdleSockets(); | 526 base_.CloseIdleSockets(); |
| 527 } | 527 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 | 573 |
| 574 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const { | 574 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const { |
| 575 return base_.histograms(); | 575 return base_.histograms(); |
| 576 } | 576 } |
| 577 | 577 |
| 578 void SSLClientSocketPool::OnSSLConfigChanged() { | 578 void SSLClientSocketPool::OnSSLConfigChanged() { |
| 579 Flush(); | 579 Flush(); |
| 580 } | 580 } |
| 581 | 581 |
| 582 } // namespace net | 582 } // namespace net |
| OLD | NEW |