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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 5 #ifndef NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
6 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 6 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/ref_counted.h" 12 #include "base/ref_counted.h"
13 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
14 #include "base/time.h" 14 #include "base/time.h"
15 #include "net/base/host_port_pair.h" 15 #include "net/base/host_port_pair.h"
16 #include "net/http/http_auth.h" 16 #include "net/http/http_auth.h"
17 #include "net/http/http_proxy_tunnel_client_socket.h"
17 #include "net/http/http_response_info.h" 18 #include "net/http/http_response_info.h"
18 #include "net/socket/client_socket_pool_base.h" 19 #include "net/socket/client_socket_pool_base.h"
19 #include "net/socket/client_socket_pool_histograms.h" 20 #include "net/socket/client_socket_pool_histograms.h"
20 #include "net/socket/client_socket_pool.h" 21 #include "net/socket/client_socket_pool.h"
21 22
22 namespace net { 23 namespace net {
23 24
24 class HostResolver; 25 class HostResolver;
25 class HttpAuthCache; 26 class HttpAuthCache;
26 class HttpAuthHandlerFactory; 27 class HttpAuthHandlerFactory;
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 int DoSpdyProxyCreateStreamComplete(int result); 151 int DoSpdyProxyCreateStreamComplete(int result);
151 152
152 scoped_refptr<HttpProxySocketParams> params_; 153 scoped_refptr<HttpProxySocketParams> params_;
153 TCPClientSocketPool* const tcp_pool_; 154 TCPClientSocketPool* const tcp_pool_;
154 SSLClientSocketPool* const ssl_pool_; 155 SSLClientSocketPool* const ssl_pool_;
155 HostResolver* const resolver_; 156 HostResolver* const resolver_;
156 157
157 State next_state_; 158 State next_state_;
158 CompletionCallbackImpl<HttpProxyConnectJob> callback_; 159 CompletionCallbackImpl<HttpProxyConnectJob> callback_;
159 scoped_ptr<ClientSocketHandle> transport_socket_handle_; 160 scoped_ptr<ClientSocketHandle> transport_socket_handle_;
160 scoped_ptr<ClientSocket> transport_socket_; 161 scoped_ptr<HttpProxyTunnelClientSocket> transport_socket_;
161 bool using_spdy_; 162 bool using_spdy_;
162 163
163 HttpResponseInfo error_response_info_; 164 HttpResponseInfo error_response_info_;
165 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
164 166
165 scoped_refptr<SpdyStream> spdy_stream_; 167 scoped_refptr<SpdyStream> spdy_stream_;
166 168
167 DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob); 169 DISALLOW_COPY_AND_ASSIGN(HttpProxyConnectJob);
168 }; 170 };
169 171
170 class HttpProxyClientSocketPool : public ClientSocketPool { 172 class HttpProxyClientSocketPool : public ClientSocketPool {
171 public: 173 public:
172 HttpProxyClientSocketPool( 174 HttpProxyClientSocketPool(
173 int max_sockets, 175 int max_sockets,
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 261
260 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocketPool); 262 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocketPool);
261 }; 263 };
262 264
263 REGISTER_SOCKET_PARAMS_FOR_POOL(HttpProxyClientSocketPool, 265 REGISTER_SOCKET_PARAMS_FOR_POOL(HttpProxyClientSocketPool,
264 HttpProxySocketParams); 266 HttpProxySocketParams);
265 267
266 } // namespace net 268 } // namespace net
267 269
268 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 270 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698