summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Leuenberger <dimstar@opensuse.org>2020-09-10 14:22:08 +0200
committerGitHub <noreply@github.com>2020-09-10 14:22:08 +0200
commit1e49b4f60ab2c88d5faa6186a7eea039a97b1001 (patch)
tree0e2f781b291be22d0bb6f29c1a42920b2162a985
parent95b75af462541838194d3b5f96374184ed6cc181 (diff)
parent75e349c6734573fb60f1e0a3c4af3e6e43a289cf (diff)
downloadlibproxy-git-1e49b4f60ab2c88d5faa6186a7eea039a97b1001.tar.gz
Merge pull request #133 from TechSmith/winProxyBypass
Parse the windows bypass list
-rw-r--r--libproxy/modules/config_w32reg.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/libproxy/modules/config_w32reg.cpp b/libproxy/modules/config_w32reg.cpp
index fc49e41..0c7d860 100644
--- a/libproxy/modules/config_w32reg.cpp
+++ b/libproxy/modules/config_w32reg.cpp
@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
******************************************************************************/
+#include <algorithm>
#include "../extension_config.hpp"
using namespace libproxy;
@@ -160,7 +161,10 @@ public:
if (get_registry(W32REG_BASEKEY, "ProxyOverride", &tmp, NULL, NULL)) {
string po = tmp;
delete tmp;
- if (po == "<local>")
+ const char windowsDelimiter = ';';
+ const char libproxyDelimiter = ',';
+ replace(po.begin(), po.end(), windowsDelimiter, libproxyDelimiter );
+ if (po.length()>0)
return po;
}
return "";