Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 300 return rv; | 300 return rv; |
| 301 } | 301 } |
| 302 | 302 |
| 303 int SSLConnectJob::DoTransportConnect() { | 303 int SSLConnectJob::DoTransportConnect() { |
| 304 DCHECK(transport_pool_); | 304 DCHECK(transport_pool_); |
| 305 | 305 |
| 306 next_state_ = STATE_TRANSPORT_CONNECT_COMPLETE; | 306 next_state_ = STATE_TRANSPORT_CONNECT_COMPLETE; |
| 307 transport_socket_handle_.reset(new ClientSocketHandle()); | 307 transport_socket_handle_.reset(new ClientSocketHandle()); |
| 308 scoped_refptr<TransportSocketParams> direct_params = | 308 scoped_refptr<TransportSocketParams> direct_params = |
| 309 params_->GetDirectConnectionParams(); | 309 params_->GetDirectConnectionParams(); |
| 310 // Enable TCP FastOpen for SSL socket. | |
| 311 // TODO (jri): Finch trial this. | |
| 312 direct_params->enable_use_tcp_fastopen(); | |
|
mmenke
2014/08/13 15:03:07
Hrm...It looks like nothing else modifies these pa
Jana
2014/08/14 06:35:31
I see... I understand, and I agree. I've modified
| |
| 310 return transport_socket_handle_->Init(group_name(), | 313 return transport_socket_handle_->Init(group_name(), |
| 311 direct_params, | 314 direct_params, |
| 312 priority(), | 315 priority(), |
| 313 io_callback_, | 316 io_callback_, |
| 314 transport_pool_, | 317 transport_pool_, |
| 315 net_log()); | 318 net_log()); |
| 316 } | 319 } |
| 317 | 320 |
| 318 int SSLConnectJob::DoTransportConnectComplete(int result) { | 321 int SSLConnectJob::DoTransportConnectComplete(int result) { |
| 319 if (result == OK) | 322 if (result == OK) |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 820 if (base_.CloseOneIdleSocket()) | 823 if (base_.CloseOneIdleSocket()) |
| 821 return true; | 824 return true; |
| 822 return base_.CloseOneIdleConnectionInHigherLayeredPool(); | 825 return base_.CloseOneIdleConnectionInHigherLayeredPool(); |
| 823 } | 826 } |
| 824 | 827 |
| 825 void SSLClientSocketPool::OnSSLConfigChanged() { | 828 void SSLClientSocketPool::OnSSLConfigChanged() { |
| 826 FlushWithError(ERR_NETWORK_CHANGED); | 829 FlushWithError(ERR_NETWORK_CHANGED); |
| 827 } | 830 } |
| 828 | 831 |
| 829 } // namespace net | 832 } // namespace net |
| OLD | NEW |