net/spdy/spdy_proxy_client_socket.cc - Issue 4935001: Allow a non-200 (or non-407) response for a CONNECT request from an HTTPS pro...

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/spdy/spdy_proxy_client_socket.cc

Issue 4935001: Allow a non-200 (or non-407) response for a CONNECT request from an HTTPS pro... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Cleaned up Created 10 years 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/spdy/spdy_proxy_client_socket.cc

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

--- net/spdy/spdy_proxy_client_socket.cc (revision 68026)

+++ net/spdy/spdy_proxy_client_socket.cc (working copy)

@@ -105,7 +105,7 @@

}

bool SpdyProxyClientSocket::IsConnectedAndIdle() const {

- return IsConnected() && !spdy_stream_->is_idle();

+ return IsConnected() && spdy_stream_.get() && !spdy_stream_->is_idle();

vandebo (ex-Chrome) 2010/12/04 00:30:37 Why did this change?

Ryan Hamilton 2010/12/09 21:19:35 Bug, actually. Removed.

}

void SpdyProxyClientSocket::SetSubresourceSpeculation() {

@@ -355,8 +355,10 @@

if (response_.headers->response_code() == 200)

return OK;

+ else if (response_.headers->response_code() == 407)

+ return ERR_TUNNEL_CONNECTION_FAILED;

else

- return ERR_TUNNEL_CONNECTION_FAILED;

+ return ERR_HTTPS_PROXY_TUNNEL_CONNECTION_RESPONSE;

}

// SpdyStream::Delegate methods:

« net/spdy/spdy_proxy_client_socket.h ('K') | « net/spdy/spdy_proxy_client_socket.h ('k') | net/spdy/spdy_proxy_client_socket_unittest.cc » ('j') | no next file with comments »