net/socket/client_socket_handle.cc - Issue 3066031: Merge 54714 - Recommit 54405 - Fix late binding induced mismatch of Socket an...

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/client_socket_handle.cc

Issue 3066031: Merge 54714 - Recommit 54405 - Fix late binding induced mismatch of Socket an... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/472/src/

Patch Set: Fix merge problems Created 10 years, 5 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/client_socket_handle.cc

diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc

index de2fd94ce19ce7b73057c125ff70df8531c64487..d9ccbd53d446ab4a25d52f6df01a30443c36b13c 100644

--- a/net/socket/client_socket_handle.cc

+++ b/net/socket/client_socket_handle.cc

@@ -59,6 +59,7 @@ void ClientSocketHandle::ResetInternal(bool cancel) {

void ClientSocketHandle::ResetErrorState() {

is_ssl_error_ = false;

ssl_error_response_info_ = HttpResponseInfo();

+ pending_http_proxy_connection_.reset();

}

LoadState ClientSocketHandle::GetLoadState() const {

« no previous file with comments | « net/socket/client_socket_handle.h ('k') | net/socket/socket_test_util.h » ('j') | no next file with comments »