Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Unified Diff: net/http/http_proxy_client_socket_pool.h

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/http/http_proxy_client_socket_pool.h
===================================================================
--- net/http/http_proxy_client_socket_pool.h (revision 68026)
+++ net/http/http_proxy_client_socket_pool.h (working copy)
@@ -14,6 +14,7 @@
#include "base/time.h"
#include "net/base/host_port_pair.h"
#include "net/http/http_auth.h"
+#include "net/http/http_proxy_tunnel_client_socket.h"
#include "net/http/http_response_info.h"
#include "net/socket/client_socket_pool_base.h"
#include "net/socket/client_socket_pool_histograms.h"
@@ -157,10 +158,11 @@
State next_state_;
CompletionCallbackImpl<HttpProxyConnectJob> callback_;
scoped_ptr<ClientSocketHandle> transport_socket_handle_;
- scoped_ptr<ClientSocket> transport_socket_;
+ scoped_ptr<HttpProxyTunnelClientSocket> transport_socket_;
bool using_spdy_;
HttpResponseInfo error_response_info_;
+ scoped_ptr<HttpStream> pending_https_proxy_response_stream_;
vandebo (ex-Chrome) 2010/12/04 00:30:37 would https_response_stream_ or proxy_connect_resp
scoped_refptr<SpdyStream> spdy_stream_;

Powered by Google App Engine
This is Rietveld 408576698