net/socket/socks_client_socket.cc - Issue 525084: Cancel any outstanding host resolve when calling SOCKSClientSocket::Disconnec...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/socket/socks_client_socket.cc

Issue 525084: Cancel any outstanding host resolve when calling SOCKSClientSocket::Disconnec... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Address wtc's comments Created 10 years, 11 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/socks_client_socket.cc

===================================================================

--- net/socket/socks_client_socket.cc (revision 35690)

+++ net/socket/socks_client_socket.cc (working copy)

@@ -107,7 +107,14 @@

void SOCKSClientSocket::Disconnect() {

completed_handshake_ = false;

+ host_resolver_.Cancel();

transport_->Disconnect();

+ // Reset other states to make sure they aren't mistakenly used later.

+ // These are the states initialized by Connect().

+ next_state_ = STATE_NONE;

+ user_callback_ = NULL;

+ load_log_ = NULL;

}

bool SOCKSClientSocket::IsConnected() const {

« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket_unittest.cc » ('j') | no next file with comments »