Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1764)

Unified Diff: net/proxy/proxy_config.cc

Issue 113811: Adding socks4 support for chromium. tested for windows and linux.... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: final patch Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net.gyp ('k') | net/proxy/proxy_config_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config.cc
===================================================================
--- net/proxy/proxy_config.cc (revision 19002)
+++ net/proxy/proxy_config.cc (working copy)
@@ -56,6 +56,17 @@
return;
}
+ // If the proxy settings has only socks and others blank,
+ // make that the default for all the proxies
+ // This gets hit only on windows when using IE settings.
+ if (url_scheme == "socks") {
+ std::string proxy_server_string = "socks://";
+ proxy_server_string.append(proxy_server_for_scheme.token());
+ single_proxy = ProxyServer::FromURI(proxy_server_string);
+ type = TYPE_SINGLE_PROXY;
+ return;
+ }
+
// Trim whitespace off the url scheme.
TrimWhitespaceASCII(url_scheme, TRIM_ALL, &url_scheme);
« no previous file with comments | « net/net.gyp ('k') | net/proxy/proxy_config_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698