diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/tcp_client_socket_win.cc | 5 | ||||
| -rw-r--r-- | net/http/http_network_transaction.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/base/tcp_client_socket_win.cc b/net/base/tcp_client_socket_win.cc index 1111d71..dff0391b 100644 --- a/net/base/tcp_client_socket_win.cc +++ b/net/base/tcp_client_socket_win.cc @@ -87,8 +87,11 @@ int TCPClientSocket::Connect(CompletionCallback* callback) { WSAEventSelect(socket_, overlapped_.hEvent, FD_CONNECT); if (!connect(socket_, ai->ai_addr, static_cast<int>(ai->ai_addrlen))) { - TRACE_EVENT_END("socket.connect", this, ""); // Connected without waiting! + CHECK(WaitForSingleObject(overlapped_.hEvent, 0) == WAIT_OBJECT_0); + BOOL ok = WSAResetEvent(overlapped_.hEvent); + CHECK(ok); + TRACE_EVENT_END("socket.connect", this, ""); return OK; } diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h index 9ac684f..487ddd3 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -21,7 +21,6 @@ namespace net { class ClientSocketFactory; -class HostResolver; class HttpChunkedDecoder; class HttpNetworkSession; class UploadDataStream; |