aboutsummaryrefslogtreecommitdiff
path: root/src/IO
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2010-01-12 06:56:01 +0000
committercorvid <corvid@lavabit.com>2010-01-12 06:56:01 +0000
commit3ab623204be09f29dbf8de269f042dc66a4f63ee (patch)
tree5f3588b441d349605a3cf70b9e562d46688d0b35 /src/IO
parent2fa3aa0931a73d9ac83ee95ebef1c66b06f708c6 (diff)
backout: That way would make no_proxy complicated.
http://lists.auriga.wearlab.de/pipermail/dillo-dev/2010-January/007167.html
Diffstat (limited to 'src/IO')
-rw-r--r--src/IO/http.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/IO/http.c b/src/IO/http.c
index afeb6d71..56a1b3a8 100644
--- a/src/IO/http.c
+++ b/src/IO/http.c
@@ -82,10 +82,8 @@ int a_Http_init(void)
if (env_proxy && strlen(env_proxy))
HTTP_Proxy = a_Url_new(env_proxy, NULL);
- if (!HTTP_Proxy && prefs.http_proxy) {
- HTTP_Proxy = a_Url_new(prefs.http_proxy, NULL);
- setenv("http_proxy", URL_STR(HTTP_Proxy), 1);
- }
+ if (!HTTP_Proxy && prefs.http_proxy)
+ HTTP_Proxy = a_Url_dup(prefs.http_proxy);
/* This allows for storing the proxy password in "user:passwd" format
* in dillorc, but as this constitutes a security problem, it was disabled.