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

Unified 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 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/spdy/spdy_session.cc » ('j') | net/spdy/spdy_session.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session.h
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index b162875cda4aa19fcec8dd964b800afddd2099de..aa4f0b5c8595217f681cb529affdd8943a34f3a9 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -555,6 +555,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, GoAwayOnSessionFlowControlError);
FRIEND_TEST_ALL_PREFIXES(SpdySessionTest,
RejectPushedStreamExceedingConcurrencyLimit);
+ FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, TrustedSpdyProxy);
FRIEND_TEST_ALL_PREFIXES(SpdySessionTest, IgnoreReservedRemoteStreamsCount);
FRIEND_TEST_ALL_PREFIXES(SpdySessionTest,
CancelReservedStreamOnHeadersReceived);
@@ -961,6 +962,12 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
max_concurrent_pushed_streams_ = value;
}
+ // Sets trusted_spdy_proxy_ to host_port_pair. This should only be called by
+ // tests.
+ 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.
+ trusted_spdy_proxy_ = host_port_pair;
+ }
+
int64_t pings_in_flight() const { return pings_in_flight_; }
SpdyPingId next_ping_id() const { return next_ping_id_; }
« 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