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

Side by Side Diff: net/http/http_network_transaction.h

Issue 1006643002: Plumb connection attempts from (non-proxy) ConnectJobs to HttpNetworkTransaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't copy attempts after reset on proxy HTTPS tunnel response Created 5 years, 9 months 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
« no previous file with comments | « no previous file | net/http/http_network_transaction.cc » ('j') | net/socket/client_socket_handle.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_NETWORK_TRANSACTION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 void OnNeedsProxyAuth(const HttpResponseInfo& response_info, 91 void OnNeedsProxyAuth(const HttpResponseInfo& response_info,
92 const SSLConfig& used_ssl_config, 92 const SSLConfig& used_ssl_config,
93 const ProxyInfo& used_proxy_info, 93 const ProxyInfo& used_proxy_info,
94 HttpAuthController* auth_controller) override; 94 HttpAuthController* auth_controller) override;
95 void OnNeedsClientAuth(const SSLConfig& used_ssl_config, 95 void OnNeedsClientAuth(const SSLConfig& used_ssl_config,
96 SSLCertRequestInfo* cert_info) override; 96 SSLCertRequestInfo* cert_info) override;
97 void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info, 97 void OnHttpsProxyTunnelResponse(const HttpResponseInfo& response_info,
98 const SSLConfig& used_ssl_config, 98 const SSLConfig& used_ssl_config,
99 const ProxyInfo& used_proxy_info, 99 const ProxyInfo& used_proxy_info,
100 HttpStream* stream) override; 100 HttpStream* stream) override;
101 101
Ryan Hamilton 2015/03/24 19:20:19 Probably should have a comment here. The other met
102 const ClientSocketHandle::ConnectionAttempts& connection_attempts() const;
Ryan Hamilton 2015/03/24 19:20:19 This makes me wonder if ConnectionAttempts should
Deprecated (see juliatuttle) 2015/04/08 19:17:19 Done.
103
102 private: 104 private:
103 friend class HttpNetworkTransactionSSLTest; 105 friend class HttpNetworkTransactionSSLTest;
104 106
105 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest, 107 FRIEND_TEST_ALL_PREFIXES(HttpNetworkTransactionTest,
106 ResetStateForRestart); 108 ResetStateForRestart);
107 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, 109 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
108 WindowUpdateReceived); 110 WindowUpdateReceived);
109 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, 111 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
110 WindowUpdateSent); 112 WindowUpdateSent);
111 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest, 113 FRIEND_TEST_ALL_PREFIXES(SpdyNetworkTransactionTest,
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 GURL AuthURL(HttpAuth::Target target) const; 252 GURL AuthURL(HttpAuth::Target target) const;
251 253
252 // Returns true if this transaction is for a WebSocket handshake 254 // Returns true if this transaction is for a WebSocket handshake
253 bool ForWebSocketHandshake() const; 255 bool ForWebSocketHandshake() const;
254 256
255 // Debug helper. 257 // Debug helper.
256 static std::string DescribeState(State state); 258 static std::string DescribeState(State state);
257 259
258 void SetStream(HttpStream* stream); 260 void SetStream(HttpStream* stream);
259 261
262 void CopyConnectionAttempts();
263
260 scoped_refptr<HttpAuthController> 264 scoped_refptr<HttpAuthController>
261 auth_controllers_[HttpAuth::AUTH_NUM_TARGETS]; 265 auth_controllers_[HttpAuth::AUTH_NUM_TARGETS];
262 266
263 // Whether this transaction is waiting for proxy auth, server auth, or is 267 // Whether this transaction is waiting for proxy auth, server auth, or is
264 // not waiting for any auth at all. |pending_auth_target_| is read and 268 // not waiting for any auth at all. |pending_auth_target_| is read and
265 // cleared by RestartWithAuth(). 269 // cleared by RestartWithAuth().
266 HttpAuth::Target pending_auth_target_; 270 HttpAuth::Target pending_auth_target_;
267 271
268 CompletionCallback io_callback_; 272 CompletionCallback io_callback_;
269 CompletionCallback callback_; 273 CompletionCallback callback_;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 bool establishing_tunnel_; 324 bool establishing_tunnel_;
321 325
322 // The helper object to use to create WebSocketHandshakeStreamBase 326 // The helper object to use to create WebSocketHandshakeStreamBase
323 // objects. Only relevant when establishing a WebSocket connection. 327 // objects. Only relevant when establishing a WebSocket connection.
324 WebSocketHandshakeStreamBase::CreateHelper* 328 WebSocketHandshakeStreamBase::CreateHelper*
325 websocket_handshake_stream_base_create_helper_; 329 websocket_handshake_stream_base_create_helper_;
326 330
327 BeforeNetworkStartCallback before_network_start_callback_; 331 BeforeNetworkStartCallback before_network_start_callback_;
328 BeforeProxyHeadersSentCallback before_proxy_headers_sent_callback_; 332 BeforeProxyHeadersSentCallback before_proxy_headers_sent_callback_;
329 333
334 ClientSocketHandle::ConnectionAttempts connection_attempts_;
335
330 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction); 336 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
331 }; 337 };
332 338
333 } // namespace net 339 } // namespace net
334 340
335 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 341 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_network_transaction.cc » ('j') | net/socket/client_socket_handle.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698