diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-18 17:45:31 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-18 17:45:31 +0000 |
| commit | 8425adc0c9cd53f6e590825486276b05f09cf90b (patch) | |
| tree | 13c67dbb5b3c044e10f981e243f36de2084fe990 /net | |
| parent | 1cd8454bf67ab6c604497340c900079dbaa19a35 (diff) | |
| download | chromium_src-8425adc0c9cd53f6e590825486276b05f09cf90b.zip chromium_src-8425adc0c9cd53f6e590825486276b05f09cf90b.tar.gz chromium_src-8425adc0c9cd53f6e590825486276b05f09cf90b.tar.bz2 | |
Linux: correctly ignore KDE "indirect" environment variable proxy settings when they are unset
BUG=41095
TEST=configure KDE to use proxy settings from unset environment variables, it should not try to use the variable names as proxies
Review URL: http://codereview.chromium.org/1518036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index efe2d13..376e6f3 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -652,6 +652,8 @@ class GConfSettingGetterImplKDE char* value = getenv(it->second.c_str()); if (value) it->second = value; + else + string_table_.erase(it); } } |