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

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

Issue 2784143003: Fix a potential infinite loop in HttpStreamFactoryImpl when a new SpdySession is established (Closed)
Patch Set: Address comments Created 3 years, 8 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_stream_factory_impl.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_HTTP_HTTP_STREAM_FACTORY_IMPL_H_ 5 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_
6 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_ 6 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 const SSLConfig& proxy_ssl_config, 69 const SSLConfig& proxy_ssl_config,
70 HttpStreamRequest::Delegate* delegate, 70 HttpStreamRequest::Delegate* delegate,
71 bool enable_ip_based_pooling, 71 bool enable_ip_based_pooling,
72 const NetLogWithSource& net_log) override; 72 const NetLogWithSource& net_log) override;
73 73
74 void PreconnectStreams(int num_streams, const HttpRequestInfo& info) override; 74 void PreconnectStreams(int num_streams, const HttpRequestInfo& info) override;
75 const HostMappingRules* GetHostMappingRules() const override; 75 const HostMappingRules* GetHostMappingRules() const override;
76 void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd, 76 void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd,
77 const std::string& parent_absolute_name) const override; 77 const std::string& parent_absolute_name) const override;
78 78
79 // Removes |request| from |spdy_session_request_map_|. Note that |request| is
80 // not owned by |this|.
81 void RemoveRequestFromSpdySessionRequestMap(Request* request);
82
79 enum JobType { 83 enum JobType {
80 MAIN, 84 MAIN,
81 ALTERNATIVE, 85 ALTERNATIVE,
82 PRECONNECT, 86 PRECONNECT,
83 }; 87 };
84 88
85 private: 89 private:
86 FRIEND_TEST_ALL_PREFIXES(HttpStreamFactoryImplRequestTest, SetPriority); 90 FRIEND_TEST_ALL_PREFIXES(HttpStreamFactoryImplRequestTest, SetPriority);
87 FRIEND_TEST_ALL_PREFIXES(HttpStreamFactoryImplRequestTest, DelayMainJob); 91 FRIEND_TEST_ALL_PREFIXES(HttpStreamFactoryImplRequestTest, DelayMainJob);
88 92
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 SpdySessionRequestMap spdy_session_request_map_; 195 SpdySessionRequestMap spdy_session_request_map_;
192 196
193 const bool for_websockets_; 197 const bool for_websockets_;
194 198
195 DISALLOW_COPY_AND_ASSIGN(HttpStreamFactoryImpl); 199 DISALLOW_COPY_AND_ASSIGN(HttpStreamFactoryImpl);
196 }; 200 };
197 201
198 } // namespace net 202 } // namespace net
199 203
200 #endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_ 204 #endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_stream_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698