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

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

Issue 1545403002: Return false when trusted SPDY proxy advertises HTTPS URL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ps Created 4 years, 11 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/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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, 548 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest,
549 StreamFlowControlTooMuchDataTwoDataFrames); 549 StreamFlowControlTooMuchDataTwoDataFrames);
550 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlNoReceiveLeaks); 550 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlNoReceiveLeaks);
551 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlNoSendLeaks); 551 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlNoSendLeaks);
552 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlEndToEnd); 552 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, SessionFlowControlEndToEnd);
553 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, StreamIdSpaceExhausted); 553 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, StreamIdSpaceExhausted);
554 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, UnstallRacesWithStreamCreation); 554 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, UnstallRacesWithStreamCreation);
555 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, GoAwayOnSessionFlowControlError); 555 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, GoAwayOnSessionFlowControlError);
556 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, 556 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest,
557 RejectPushedStreamExceedingConcurrencyLimit); 557 RejectPushedStreamExceedingConcurrencyLimit);
558 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, TrustedSpdyProxy);
558 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, IgnoreReservedRemoteStreamsCount); 559 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, IgnoreReservedRemoteStreamsCount);
559 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, 560 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest,
560 CancelReservedStreamOnHeadersReceived); 561 CancelReservedStreamOnHeadersReceived);
561 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, RejectInvalidUnknownFrames); 562 FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, RejectInvalidUnknownFrames);
562 FRIEND_TEST_ALL_PREFIXES(SpdySessionPoolTest, IPAddressChanged); 563 FRIEND_TEST_ALL_PREFIXES(SpdySessionPoolTest, IPAddressChanged);
563 564
564 typedef std::deque<base::WeakPtr<SpdyStreamRequest> > 565 typedef std::deque<base::WeakPtr<SpdyStreamRequest> >
565 PendingStreamRequestQueue; 566 PendingStreamRequestQueue;
566 567
567 struct ActiveStreamInfo { 568 struct ActiveStreamInfo {
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 } 955 }
955 956
956 void set_hung_interval(base::TimeDelta duration) { 957 void set_hung_interval(base::TimeDelta duration) {
957 hung_interval_ = duration; 958 hung_interval_ = duration;
958 } 959 }
959 960
960 void set_max_concurrent_pushed_streams(size_t value) { 961 void set_max_concurrent_pushed_streams(size_t value) {
961 max_concurrent_pushed_streams_ = value; 962 max_concurrent_pushed_streams_ = value;
962 } 963 }
963 964
965 // Sets trusted_spdy_proxy_ to host_port_pair. This should only be called by
966 // tests.
967 void set_trusted_spdy_proxy_for_tests(const HostPortPair& host_port_pair) {
bengr 2015/12/29 18:02:33 This shouldn't be necessary. See my comment in you
tbansal1 2015/12/30 00:00:52 Done.
968 trusted_spdy_proxy_ = host_port_pair;
969 }
970
964 int64_t pings_in_flight() const { return pings_in_flight_; } 971 int64_t pings_in_flight() const { return pings_in_flight_; }
965 972
966 SpdyPingId next_ping_id() const { return next_ping_id_; } 973 SpdyPingId next_ping_id() const { return next_ping_id_; }
967 974
968 base::TimeTicks last_activity_time() const { return last_activity_time_; } 975 base::TimeTicks last_activity_time() const { return last_activity_time_; }
969 976
970 bool check_ping_status_pending() const { return check_ping_status_pending_; } 977 bool check_ping_status_pending() const { return check_ping_status_pending_; }
971 978
972 size_t max_concurrent_streams() const { return max_concurrent_streams_; } 979 size_t max_concurrent_streams() const { return max_concurrent_streams_; }
973 980
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 // Used for posting asynchronous IO tasks. We use this even though 1221 // Used for posting asynchronous IO tasks. We use this even though
1215 // SpdySession is refcounted because we don't need to keep the SpdySession 1222 // SpdySession is refcounted because we don't need to keep the SpdySession
1216 // alive if the last reference is within a RunnableMethod. Just revoke the 1223 // alive if the last reference is within a RunnableMethod. Just revoke the
1217 // method. 1224 // method.
1218 base::WeakPtrFactory<SpdySession> weak_factory_; 1225 base::WeakPtrFactory<SpdySession> weak_factory_;
1219 }; 1226 };
1220 1227
1221 } // namespace net 1228 } // namespace net
1222 1229
1223 #endif // NET_SPDY_SPDY_SESSION_H_ 1230 #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