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

Side by Side Diff: net/spdy/spdy_session.h

Issue 25956002: [SPDY] Remove references to obsolete SPDY versions SPDY/1 and SPDY/2.1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « net/spdy/buffered_spdy_framer.cc ('k') | net/spdy/spdy_session.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) 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_SPDY_SPDY_SESSION_H_ 5 #ifndef NET_SPDY_SPDY_SESSION_H_
6 #define NET_SPDY_SPDY_SESSION_H_ 6 #define NET_SPDY_SPDY_SESSION_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 // 255 //
256 // Returns OK on success, or an error on failure. Never returns 256 // Returns OK on success, or an error on failure. Never returns
257 // ERR_IO_PENDING. If an error is returned, the session must be 257 // ERR_IO_PENDING. If an error is returned, the session must be
258 // destroyed immediately. 258 // destroyed immediately.
259 Error InitializeWithSocket(scoped_ptr<ClientSocketHandle> connection, 259 Error InitializeWithSocket(scoped_ptr<ClientSocketHandle> connection,
260 SpdySessionPool* pool, 260 SpdySessionPool* pool,
261 bool is_secure, 261 bool is_secure,
262 int certificate_error_code); 262 int certificate_error_code);
263 263
264 // Returns the protocol used by this session. Always between 264 // Returns the protocol used by this session. Always between
265 // kProtoSPDY2 and kProtoSPDYMaximumVersion. 265 // kProtoSPDYMinimumVersion and kProtoSPDYMaximumVersion.
266 //
267 // TODO(akalin): Change the lower bound to kProtoSPDYMinimumVersion
268 // once we stop supporting SPDY/1.
269 NextProto protocol() const { return protocol_; } 266 NextProto protocol() const { return protocol_; }
270 267
271 // Check to see if this SPDY session can support an additional domain. 268 // Check to see if this SPDY session can support an additional domain.
272 // If the session is un-authenticated, then this call always returns true. 269 // If the session is un-authenticated, then this call always returns true.
273 // For SSL-based sessions, verifies that the server certificate in use by 270 // For SSL-based sessions, verifies that the server certificate in use by
274 // this session provides authentication for the domain and no client 271 // this session provides authentication for the domain and no client
275 // certificate or channel ID was sent to the original server during the SSL 272 // certificate or channel ID was sent to the original server during the SSL
276 // handshake. NOTE: This function can have false negatives on some 273 // handshake. NOTE: This function can have false negatives on some
277 // platforms. 274 // platforms.
278 // TODO(wtc): rename this function and the Net.SpdyIPPoolDomainMatch 275 // TODO(wtc): rename this function and the Net.SpdyIPPoolDomainMatch
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 1090
1094 BoundNetLog net_log_; 1091 BoundNetLog net_log_;
1095 1092
1096 // Outside of tests, these should always be true. 1093 // Outside of tests, these should always be true.
1097 bool verify_domain_authentication_; 1094 bool verify_domain_authentication_;
1098 bool enable_sending_initial_data_; 1095 bool enable_sending_initial_data_;
1099 bool enable_credential_frames_; 1096 bool enable_credential_frames_;
1100 bool enable_compression_; 1097 bool enable_compression_;
1101 bool enable_ping_based_connection_checking_; 1098 bool enable_ping_based_connection_checking_;
1102 1099
1103 // The SPDY protocol used. Always between kProtoSPDY2 and 1100 // The SPDY protocol used. Always between kProtoSPDYMinimumVersion and
1104 // kProtoSPDYMaximumVersion. 1101 // kProtoSPDYMaximumVersion.
1105 //
1106 // TODO(akalin): Change the lower bound to kProtoSPDYMinimumVersion
1107 // once we stop supporting SPDY/1.
1108 NextProto protocol_; 1102 NextProto protocol_;
1109 1103
1110 SpdyCredentialState credential_state_; 1104 SpdyCredentialState credential_state_;
1111 1105
1112 // |connection_at_risk_of_loss_time_| is an optimization to avoid sending 1106 // |connection_at_risk_of_loss_time_| is an optimization to avoid sending
1113 // wasteful preface pings (when we just got some data). 1107 // wasteful preface pings (when we just got some data).
1114 // 1108 //
1115 // If it is zero (the most conservative figure), then we always send the 1109 // If it is zero (the most conservative figure), then we always send the
1116 // preface ping (when none are in flight). 1110 // preface ping (when none are in flight).
1117 // 1111 //
(...skipping 16 matching lines...) Expand all
1134 // This SPDY proxy is allowed to push resources from origins that are 1128 // This SPDY proxy is allowed to push resources from origins that are
1135 // different from those of their associated streams. 1129 // different from those of their associated streams.
1136 HostPortPair trusted_spdy_proxy_; 1130 HostPortPair trusted_spdy_proxy_;
1137 1131
1138 TimeFunc time_func_; 1132 TimeFunc time_func_;
1139 }; 1133 };
1140 1134
1141 } // namespace net 1135 } // namespace net
1142 1136
1143 #endif // NET_SPDY_SPDY_SESSION_H_ 1137 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW
« no previous file with comments | « net/spdy/buffered_spdy_framer.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698