net/http/http_proxy_client_socket_pool.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/http/http_proxy_client_socket_pool.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: Pass a ClientSocketHandle up out of the HttpProxyClientSocketPool 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

« net/http/http_proxy_client_socket_pool.h ('K') | « net/http/http_proxy_client_socket_pool.h ('k') | net/http/http_proxy_client_socket_pool_unittest.cc » ('j') | net/http/http_stream_request.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_proxy_client_socket_pool.cc

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

--- net/http/http_proxy_client_socket_pool.cc (revision 68959)

+++ net/http/http_proxy_client_socket_pool.cc (working copy)

@@ -318,13 +318,16 @@

params_->http_auth_cache(),

params_->http_auth_handler_factory(),

params_->tunnel(),

- using_spdy_));

+ using_spdy_,

+ params_->ssl_params() != NULL));

return transport_socket_->Connect(&callback_);

}

int HttpProxyConnectJob::DoHttpProxyConnectComplete(int result) {

- if (result == OK || result == ERR_PROXY_AUTH_REQUESTED)

+ if (result == OK || result == ERR_PROXY_AUTH_REQUESTED ||

+ result == ERR_HTTPS_PROXY_TUNNEL_RESPONSE) {

vandebo (ex-Chrome) 2010/12/16 02:24:31 nit: can you update the comment in client_socket_p

Ryan Hamilton 2010/12/16 05:23:50 Done.

set_socket(transport_socket_.release());

+ }

return result;

}