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

Unified Diff: net/socket/ssl_client_socket_pool.cc

Issue 1006643002: Plumb connection attempts from (non-proxy) ConnectJobs to HttpNetworkTransaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: net/socket/ssl_client_socket_pool.cc
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index 6643ef4e3af0ac5e00c9c0b27f31b37e278abd1d..dab60c3b42d07cec5c741f3085a9627f0faeedf6 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -244,6 +244,14 @@ void SSLConnectJob::GetAdditionalErrorState(ClientSocketHandle* handle) {
handle->set_ssl_error_response_info(error_response_info_);
if (!connect_timing_.ssl_start.is_null())
handle->set_is_ssl_error(true);
+
+ // If there were any failures establishing the underlying TCP connection,
+ // pass them on.
+ if (transport_socket_handle_) {
+ std::vector<ClientSocketHandle::ConnectionAttempt> attempts;
+ attempts = transport_socket_handle_->connection_attempts();
+ handle->set_connection_attempts(attempts);
Ryan Hamilton 2015/03/12 20:06:04 Can you simply do this: handle->set_connection_at
Deprecated (see juliatuttle) 2015/03/16 15:53:53 Done.
+ }
}
void SSLConnectJob::OnIOComplete(int result) {

Powered by Google App Engine
This is Rietveld 408576698