Index: net/http/http_stream_factory.cc |
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc |
index 29d9b2642cfcd956b97c5eb3d78afdb784bc549d..f84b80c925399398725e6baa1335f75c1080444e 100644 |
--- a/net/http/http_stream_factory.cc |
+++ b/net/http/http_stream_factory.cc |
@@ -60,7 +60,7 @@ void HttpStreamFactory::ProcessAlternateProtocol( |
} |
if (!base::StringToInt(port_protocol_vector[0], &port) || |
- port <= 0 || port >= 1 << 16) { |
+ port == 0 || !IsPortValid(port)) { |
DVLOG(1) << kAlternateProtocolHeader |
<< " header has unrecognizable port: " |
<< port_protocol_vector[0]; |
@@ -94,8 +94,8 @@ void HttpStreamFactory::ProcessAlternateProtocol( |
return; |
} |
- http_server_properties->SetAlternateProtocol(host_port, port, protocol, |
- probability); |
+ http_server_properties->SetAlternateProtocol( |
+ host_port, static_cast<uint16>(port), protocol, probability); |
} |
GURL HttpStreamFactory::ApplyHostMappingRules(const GURL& url, |