summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorarindam@chromium.org <arindam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 05:23:30 +0000
committerarindam@chromium.org <arindam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-14 05:23:30 +0000
commit87a102b1bd6d2e450f10ed0931c09ffcfef9a51c (patch)
tree6877259bfdf9ec82c9952a1f66d9d450c037f331 /webkit
parent565243e032009b7022b49c085b1157c3fb4986d4 (diff)
downloadchromium_src-87a102b1bd6d2e450f10ed0931c09ffcfef9a51c.zip
chromium_src-87a102b1bd6d2e450f10ed0931c09ffcfef9a51c.tar.gz
chromium_src-87a102b1bd6d2e450f10ed0931c09ffcfef9a51c.tar.bz2
Whenever proxy configurations contain socks and http/https/ftp proxies, socks configuration over rid the other proxies. Fixes the issue. Attached test cases.
BUG=15738 TEST=unittest (ProxyConfigTest.ParseProxyRules, ProxyServiceTest.DefaultProxyFallbackToSOCKS) Review URL: http://codereview.chromium.org/149191 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
0 files changed, 0 insertions, 0 deletions