| Index: net/proxy/proxy_server.cc
|
| ===================================================================
|
| --- net/proxy/proxy_server.cc (revision 52951)
|
| +++ net/proxy/proxy_server.cc (working copy)
|
| @@ -34,6 +34,8 @@
|
| return ProxyServer::SCHEME_SOCKS5;
|
| if (LowerCaseEqualsASCII(begin, end, "direct"))
|
| return ProxyServer::SCHEME_DIRECT;
|
| + if (LowerCaseEqualsASCII(begin, end, "https"))
|
| + return ProxyServer::SCHEME_HTTPS;
|
|
|
| return ProxyServer::SCHEME_INVALID;
|
| }
|
| @@ -53,6 +55,8 @@
|
| return ProxyServer::SCHEME_SOCKS5;
|
| if (LowerCaseEqualsASCII(begin, end, "direct"))
|
| return ProxyServer::SCHEME_DIRECT;
|
| + if (LowerCaseEqualsASCII(begin, end, "https"))
|
| + return ProxyServer::SCHEME_HTTPS;
|
| return ProxyServer::SCHEME_INVALID;
|
| }
|
|
|
| @@ -132,6 +136,8 @@
|
| return std::string("socks4://") + host_and_port();
|
| case SCHEME_SOCKS5:
|
| return std::string("socks5://") + host_and_port();
|
| + case SCHEME_HTTPS:
|
| + return std::string("https://") + host_and_port();
|
| default:
|
| // Got called with an invalid scheme.
|
| NOTREACHED();
|
| @@ -180,6 +186,8 @@
|
| return std::string("SOCKS ") + host_and_port();
|
| case SCHEME_SOCKS5:
|
| return std::string("SOCKS5 ") + host_and_port();
|
| + case SCHEME_HTTPS:
|
| + return std::string("HTTPS ") + host_and_port();
|
| default:
|
| // Got called with an invalid scheme.
|
| NOTREACHED();
|
| @@ -195,6 +203,8 @@
|
| case SCHEME_SOCKS4:
|
| case SCHEME_SOCKS5:
|
| return 1080;
|
| + case SCHEME_HTTPS:
|
| + return 443;
|
| default:
|
| return -1;
|
| }
|
|
|