diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 03:58:29 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 03:58:29 +0000 |
| commit | 511f6f525dacf2512439b12784186074a0f6cd5c (patch) | |
| tree | 5fa90bbe0fa255de3d78d00dcffd333830e13aea /net/http/http_proxy_client_socket_pool.h | |
| parent | 8aad42dcc8d683242c730901c51061de710046b9 (diff) | |
| download | chromium_src-511f6f525dacf2512439b12784186074a0f6cd5c.zip chromium_src-511f6f525dacf2512439b12784186074a0f6cd5c.tar.gz chromium_src-511f6f525dacf2512439b12784186074a0f6cd5c.tar.bz2 | |
Allow a non-200 (or non-407) response for a CONNECT request from an HTTPS proxy
to be consumed by chrome. Among other things, this will allow the proxy to
inform the user that the hostname could not be resolved or similar conditions.
This adds a new OnHttpsProxyTunnelConnectionResponse method to
StreamRequest::Delegate which is invoked when an HTTPS proxy returns a non-200,
non-407 response. The method is called with an HttpResponseInfor argument to
access the request headers, and an HttpStream argument to access the response body.
BUG=none
TEST=HttpNetworkTransactionTest
Review URL: http://codereview.chromium.org/4935001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_proxy_client_socket_pool.h')
| -rw-r--r-- | net/http/http_proxy_client_socket_pool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h index fb3967d..91963d8 100644 --- a/net/http/http_proxy_client_socket_pool.h +++ b/net/http/http_proxy_client_socket_pool.h @@ -15,6 +15,7 @@ #include "net/base/host_port_pair.h" #include "net/http/http_auth.h" #include "net/http/http_response_info.h" +#include "net/http/proxy_client_socket.h" #include "net/socket/client_socket_pool_base.h" #include "net/socket/client_socket_pool_histograms.h" #include "net/socket/client_socket_pool.h" @@ -157,7 +158,7 @@ class HttpProxyConnectJob : public ConnectJob { State next_state_; CompletionCallbackImpl<HttpProxyConnectJob> callback_; scoped_ptr<ClientSocketHandle> transport_socket_handle_; - scoped_ptr<ClientSocket> transport_socket_; + scoped_ptr<ProxyClientSocket> transport_socket_; bool using_spdy_; HttpResponseInfo error_response_info_; |