| Index: net/http/http_server_properties_impl.cc
|
| diff --git a/net/http/http_server_properties_impl.cc b/net/http/http_server_properties_impl.cc
|
| index d048e98871acba04071ccae2c0c81d51d494bc26..2ffaa711b65105e258ea395f687a1be18b2a305c 100644
|
| --- a/net/http/http_server_properties_impl.cc
|
| +++ b/net/http/http_server_properties_impl.cc
|
| @@ -168,7 +168,7 @@ void HttpServerPropertiesImpl::Clear() {
|
| server_network_stats_map_.Clear();
|
| }
|
|
|
| -bool HttpServerPropertiesImpl::SupportsSpdy(
|
| +bool HttpServerPropertiesImpl::SupportsRequestPriority(
|
| const HostPortPair& host_port_pair) {
|
| DCHECK(CalledOnValidThread());
|
| if (host_port_pair.host().empty())
|
| @@ -176,9 +176,14 @@ bool HttpServerPropertiesImpl::SupportsSpdy(
|
|
|
| SpdyServerHostPortMap::iterator spdy_host_port =
|
| spdy_servers_map_.Get(host_port_pair.ToString());
|
| - if (spdy_host_port != spdy_servers_map_.end())
|
| - return spdy_host_port->second;
|
| - return false;
|
| + if (spdy_host_port != spdy_servers_map_.end() && spdy_host_port->second)
|
| + return true;
|
| +
|
| + if (!HasAlternateProtocol(host_port_pair))
|
| + return false;
|
| +
|
| + AlternateProtocolInfo info = GetAlternateProtocol(host_port_pair);
|
| + return info.protocol == QUIC;
|
| }
|
|
|
| void HttpServerPropertiesImpl::SetSupportsSpdy(
|
|
|