diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | dillorc | 7 | ||||
| -rw-r--r-- | src/IO/http.c | 6 | ||||
| -rw-r--r-- | src/prefs.c | 2 | ||||
| -rw-r--r-- | src/prefs.h | 2 | ||||
| -rw-r--r-- | src/prefsparser.cc | 2 |
6 files changed, 14 insertions, 9 deletions
@@ -2,7 +2,7 @@ Dillo project ============================================================================= -dillo-2.2 [??] +dillo-2.2 [??, 2010] +- Added keybindings for scrolling. Patch: corvid, Jorge Arellano Cid @@ -59,6 +59,8 @@ dillo-2.2 [??] - Allow keysyms in keysrc. - Explicitly check installation bindir for dpid (BUG 930) - General cookies overhaul. + - If http_proxy environment var not set and http_proxy pref is set, then set + env from pref so a spawned dpid/downloads dpi/wget will see pref value. Patches: corvid +- Support for the letter-spacing property. Patch: Johannes Hofmann, corvid @@ -113,8 +113,8 @@ # Set the proxy information for http. # Note that the http_proxy environment variable overrides this setting. -# WARNING: FTP and downloads plugins use wget. To use a proxy with them, -# you will need to configure wget accordingly. +# WARNING: For ftp, dillo uses wget. To use a proxy with it, you will need +# to set the ftp_proxy environment variable. # http_proxy="http://localhost:8080/" #(by default, no proxy is used) @@ -123,7 +123,8 @@ # http_proxyuser="joe" #(by default, no proxy is used) -# Set the domains to access without proxy +# Set the domains to access without proxy. +# Note that the downloads dpi does not know about this list. # no_proxy = ".hola.com .mynet.cl .hi.de" #no_proxy="localhost 127.0.0.1" diff --git a/src/IO/http.c b/src/IO/http.c index 56a1b3a8..afeb6d71 100644 --- a/src/IO/http.c +++ b/src/IO/http.c @@ -82,8 +82,10 @@ 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_dup(prefs.http_proxy); + if (!HTTP_Proxy && prefs.http_proxy) { + HTTP_Proxy = a_Url_new(prefs.http_proxy, NULL); + setenv("http_proxy", URL_STR(HTTP_Proxy), 1); + } /* This allows for storing the proxy password in "user:passwd" format * in dillorc, but as this constitutes a security problem, it was disabled. diff --git a/src/prefs.c b/src/prefs.c index e65d8e1a..615256de 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -104,7 +104,7 @@ void a_Prefs_freeall(void) dFree(prefs.font_serif); a_Url_free(prefs.home); dFree(prefs.http_language); - a_Url_free(prefs.http_proxy); + dFree(prefs.http_proxy); dFree(prefs.http_proxyuser); dFree(prefs.http_referer); dFree(prefs.no_proxy); diff --git a/src/prefs.h b/src/prefs.h index f3e0a977..463a0c8a 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -34,7 +34,7 @@ struct _DilloPrefs { int xpos; int ypos; char *http_language; - DilloUrl *http_proxy; + char *http_proxy; char *http_proxyuser; char *http_referer; char *no_proxy; diff --git a/src/prefsparser.cc b/src/prefsparser.cc index e77aecf6..23876dd2 100644 --- a/src/prefsparser.cc +++ b/src/prefsparser.cc @@ -63,7 +63,7 @@ int PrefsParser::parseOption(char *name, char *value) { "geometry", NULL, PREFS_GEOMETRY }, { "home", &prefs.home, PREFS_URL }, { "http_language", &prefs.http_language, PREFS_STRING }, - { "http_proxy", &prefs.http_proxy, PREFS_URL }, + { "http_proxy", &prefs.http_proxy, PREFS_STRING }, { "http_proxyuser", &prefs.http_proxyuser, PREFS_STRING }, { "http_referer", &prefs.http_referer, PREFS_STRING }, { "limit_text_width", &prefs.limit_text_width, PREFS_BOOL }, |