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

Side by Side Diff: net/socket/ssl_client_socket_pool.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
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/socket/ssl_client_socket_pool.h" 5 #include "net/socket/ssl_client_socket_pool.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 364
365 int SSLConnectJob::DoTunnelConnectComplete(int result) { 365 int SSLConnectJob::DoTunnelConnectComplete(int result) {
366 // Extract the information needed to prompt for appropriate proxy 366 // Extract the information needed to prompt for appropriate proxy
367 // authentication so that when ClientSocketPoolBaseHelper calls 367 // authentication so that when ClientSocketPoolBaseHelper calls
368 // |GetAdditionalErrorState|, we can easily set the state. 368 // |GetAdditionalErrorState|, we can easily set the state.
369 if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) { 369 if (result == ERR_SSL_CLIENT_AUTH_CERT_NEEDED) {
370 error_response_info_ = transport_socket_handle_->ssl_error_response_info(); 370 error_response_info_ = transport_socket_handle_->ssl_error_response_info();
371 } else if (result == ERR_PROXY_AUTH_REQUESTED || 371 } else if (result == ERR_PROXY_AUTH_REQUESTED ||
372 result == ERR_HTTPS_PROXY_TUNNEL_RESPONSE) { 372 result == ERR_HTTPS_PROXY_TUNNEL_RESPONSE) {
373 StreamSocket* socket = transport_socket_handle_->socket(); 373 StreamSocket* socket = transport_socket_handle_->socket();
374 HttpProxyClientSocket* tunnel_socket = 374 ProxyClientSocket* tunnel_socket = static_cast<ProxyClientSocket*>(socket);
375 static_cast<HttpProxyClientSocket*>(socket);
376 error_response_info_ = *tunnel_socket->GetConnectResponseInfo(); 375 error_response_info_ = *tunnel_socket->GetConnectResponseInfo();
377 } 376 }
378 if (result < 0) 377 if (result < 0)
379 return result; 378 return result;
380 next_state_ = STATE_CREATE_SSL_SOCKET; 379 next_state_ = STATE_CREATE_SSL_SOCKET;
381 return result; 380 return result;
382 } 381 }
383 382
384 int SSLConnectJob::DoCreateSSLSocket() { 383 int SSLConnectJob::DoCreateSSLSocket() {
385 next_state_ = STATE_CHECK_FOR_RESUME; 384 next_state_ = STATE_CHECK_FOR_RESUME;
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 CHECK(it != messenger_map_.end()); 839 CHECK(it != messenger_map_.end());
841 delete it->second; 840 delete it->second;
842 messenger_map_.erase(it); 841 messenger_map_.erase(it);
843 } 842 }
844 843
845 void SSLClientSocketPool::OnSSLConfigChanged() { 844 void SSLClientSocketPool::OnSSLConfigChanged() {
846 FlushWithError(ERR_NETWORK_CHANGED); 845 FlushWithError(ERR_NETWORK_CHANGED);
847 } 846 }
848 847
849 } // namespace net 848 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/websocket_endpoint_lock_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698