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

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

Issue 2805039: SPDY: Make sure we don't try to send https/wss over an unauthenticated, but encrypted SSL socket. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Propagate error codes. Created 10 years, 5 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') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 // True if we've logged the time of the first response byte. Used to 288 // True if we've logged the time of the first response byte. Used to
289 // prevent logging across authentication activity where we see multiple 289 // prevent logging across authentication activity where we see multiple
290 // responses. 290 // responses.
291 bool logged_response_time_; 291 bool logged_response_time_;
292 292
293 bool using_ssl_; // True if handling a HTTPS request 293 bool using_ssl_; // True if handling a HTTPS request
294 294
295 // True if this network transaction is using SPDY instead of HTTP. 295 // True if this network transaction is using SPDY instead of HTTP.
296 bool using_spdy_; 296 bool using_spdy_;
297 297
298 // The certificate error while using SPDY over SSL for insecure URLs.
299 int spdy_certificate_error_;
300
298 AlternateProtocolMode alternate_protocol_mode_; 301 AlternateProtocolMode alternate_protocol_mode_;
299 302
300 // Only valid if |alternate_protocol_mode_| == kUsingAlternateProtocol. 303 // Only valid if |alternate_protocol_mode_| == kUsingAlternateProtocol.
301 HttpAlternateProtocols::Protocol alternate_protocol_; 304 HttpAlternateProtocols::Protocol alternate_protocol_;
302 305
303 SSLConfig ssl_config_; 306 SSLConfig ssl_config_;
304 307
305 std::string request_headers_; 308 std::string request_headers_;
306 309
307 // The size in bytes of the buffer we use to drain the response body that 310 // The size in bytes of the buffer we use to drain the response body that
(...skipping 17 matching lines...) Expand all
325 // The hostname and port of the endpoint. This is not necessarily the one 328 // The hostname and port of the endpoint. This is not necessarily the one
326 // specified by the URL, due to Alternate-Protocol or fixed testing ports. 329 // specified by the URL, due to Alternate-Protocol or fixed testing ports.
327 HostPortPair endpoint_; 330 HostPortPair endpoint_;
328 331
329 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction); 332 DISALLOW_COPY_AND_ASSIGN(HttpNetworkTransaction);
330 }; 333 };
331 334
332 } // namespace net 335 } // namespace net
333 336
334 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 337 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698