diff options
Diffstat (limited to 'net/base/ssl_client_socket_mac.cc')
-rw-r--r-- | net/base/ssl_client_socket_mac.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/base/ssl_client_socket_mac.cc b/net/base/ssl_client_socket_mac.cc index 5ed6c67..c43a4d1 100644 --- a/net/base/ssl_client_socket_mac.cc +++ b/net/base/ssl_client_socket_mac.cc @@ -279,12 +279,6 @@ int SSLClientSocketMac::Connect(CompletionCallback* callback) { return rv; } -int SSLClientSocketMac::ReconnectIgnoringLastError( - CompletionCallback* callback) { - // TODO(darin): implement me! - return ERR_FAILED; -} - void SSLClientSocketMac::Disconnect() { completed_handshake_ = false; @@ -451,7 +445,13 @@ int SSLClientSocketMac::DoLoop(int last_io_result) { int SSLClientSocketMac::DoConnect() { next_state_ = STATE_CONNECT_COMPLETE; - return transport_->Connect(&io_callback_); + + // The caller has to make sure that the transport socket is connected. If + // it isn't, we will eventually fail when trying to negotiate an SSL session. + // But we cannot call transport_->Connect(), as we do not know if there is + // any proxy negotiation that needs to be performed prior to establishing + // the SSL session. + return OK; } int SSLClientSocketMac::DoConnectComplete(int result) { |