| Index: net/spdy/spdy_session.h
|
| diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
|
| index 4037e03601a414373c8d98772e947b100c8080a2..d2da8637d5922b8220d4e951429bcaa347142a47 100644
|
| --- a/net/spdy/spdy_session.h
|
| +++ b/net/spdy/spdy_session.h
|
| @@ -70,6 +70,7 @@ class BoundNetLog;
|
| struct LoadTimingInfo;
|
| class SpdyStream;
|
| class SSLInfo;
|
| +class TransportSecurityState;
|
|
|
| // NOTE: There's an enum of the same name (also with numeric suffixes)
|
| // in histograms.xml. Be sure to add new values there also.
|
| @@ -222,6 +223,13 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| FLOW_CONTROL_STREAM_AND_SESSION
|
| };
|
|
|
| + // Returns true if |hostname| can be pooled into an existing connection
|
| + // associated with |ssl_info|.
|
| + static bool CanPool(TransportSecurityState* transport_security_state,
|
| + const SSLInfo& ssl_info,
|
| + const std::string& old_hostname,
|
| + const std::string& new_hostname);
|
| +
|
| // Create a new SpdySession.
|
| // |spdy_session_key| is the host/port that this session connects to, privacy
|
| // and proxy configuration settings that it's using.
|
| @@ -229,6 +237,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| // network events to.
|
| SpdySession(const SpdySessionKey& spdy_session_key,
|
| const base::WeakPtr<HttpServerProperties>& http_server_properties,
|
| + TransportSecurityState* transport_security_state,
|
| bool verify_domain_authentication,
|
| bool enable_sending_initial_data,
|
| bool enable_compression,
|
| @@ -963,6 +972,8 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
|
| SpdySessionPool* pool_;
|
| const base::WeakPtr<HttpServerProperties> http_server_properties_;
|
|
|
| + TransportSecurityState* transport_security_state_;
|
| +
|
| // The socket handle for this session.
|
| scoped_ptr<ClientSocketHandle> connection_;
|
|
|
|
|