diff options
Diffstat (limited to 'net/proxy/proxy_server.cc')
-rw-r--r-- | net/proxy/proxy_server.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc index 50bf4d9..6c47fee 100644 --- a/net/proxy/proxy_server.cc +++ b/net/proxy/proxy_server.cc @@ -85,15 +85,17 @@ std::string ProxyServer::host_and_port() const { } // static -ProxyServer ProxyServer::FromURI(const std::string& uri) { - return FromURI(uri.begin(), uri.end()); +ProxyServer ProxyServer::FromURI(const std::string& uri, + Scheme default_scheme) { + return FromURI(uri.begin(), uri.end(), default_scheme); } // static ProxyServer ProxyServer::FromURI(std::string::const_iterator begin, - std::string::const_iterator end) { - // We will default to HTTP if no scheme specifier was given. - Scheme scheme = SCHEME_HTTP; + std::string::const_iterator end, + Scheme default_scheme) { + // We will default to |default_scheme| if no scheme specifier was given. + Scheme scheme = default_scheme; // Trim the leading/trailing whitespace. HttpUtil::TrimLWS(&begin, &end); |