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

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

Issue 10829066: Fix a SPDY crash bug where a CHECK() is hit because a cancelled stream is considered active by the … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add SPDY/3 test. Created 8 years, 4 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 | « no previous file | net/spdy/spdy_session.cc » ('j') | net/spdy/spdy_session.cc » ('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_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 <algorithm> 8 #include <algorithm>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // Close a stream that has been created but is not yet active. 217 // Close a stream that has been created but is not yet active.
218 void CloseCreatedStream(SpdyStream* stream, int status); 218 void CloseCreatedStream(SpdyStream* stream, int status);
219 219
220 // Reset a stream by sending a RST_STREAM frame with given status code. 220 // Reset a stream by sending a RST_STREAM frame with given status code.
221 // Also closes the stream. Was not piggybacked to CloseStream since not 221 // Also closes the stream. Was not piggybacked to CloseStream since not
222 // all of the calls to CloseStream necessitate sending a RST_STREAM. 222 // all of the calls to CloseStream necessitate sending a RST_STREAM.
223 void ResetStream(SpdyStreamId stream_id, 223 void ResetStream(SpdyStreamId stream_id,
224 SpdyStatusCodes status, 224 SpdyStatusCodes status,
225 const std::string& description); 225 const std::string& description);
226 226
227 // Delete a stream that has been created, but not yet activated.
willchan no longer on Chromium 2012/07/27 21:41:42 The difference between deleting and closing a crea
Ryan Hamilton 2012/07/27 21:51:35 This was an oversight on my part. (I can't believ
228 void DeleteCreatedStream(SpdyStream* stream);
229
227 // Check if a stream is active. 230 // Check if a stream is active.
228 bool IsStreamActive(SpdyStreamId stream_id) const; 231 bool IsStreamActive(SpdyStreamId stream_id) const;
229 232
230 // The LoadState is used for informing the user of the current network 233 // The LoadState is used for informing the user of the current network
231 // status, such as "resolving host", "connecting", etc. 234 // status, such as "resolving host", "connecting", etc.
232 LoadState GetLoadState() const; 235 LoadState GetLoadState() const;
233 236
234 // Fills SSL info in |ssl_info| and returns true when SSL is in use. 237 // Fills SSL info in |ssl_info| and returns true when SSL is in use.
235 bool GetSSLInfo(SSLInfo* ssl_info, 238 bool GetSSLInfo(SSLInfo* ssl_info,
236 bool* was_npn_negotiated, 239 bool* was_npn_negotiated,
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 base::TimeDelta hung_interval_; 745 base::TimeDelta hung_interval_;
743 746
744 // This SPDY proxy is allowed to push resources from origins that are 747 // This SPDY proxy is allowed to push resources from origins that are
745 // different from those of their associated streams. 748 // different from those of their associated streams.
746 HostPortPair trusted_spdy_proxy_; 749 HostPortPair trusted_spdy_proxy_;
747 }; 750 };
748 751
749 } // namespace net 752 } // namespace net
750 753
751 #endif // NET_SPDY_SPDY_SESSION_H_ 754 #endif // NET_SPDY_SPDY_SESSION_H_
OLDNEW
« no previous file with comments | « no previous file | net/spdy/spdy_session.cc » ('j') | net/spdy/spdy_session.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698