aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2009-09-03 18:37:06 +0000
committercorvid <corvid@lavabit.com>2009-09-03 18:37:06 +0000
commit6d9ff8f4465218ee55ee25c1ae37868a8304b6eb (patch)
treed117b93aef6a01498cd98b2b79b61c31921f4a4e
parent1428b404564a2d36e7726849981929d3f28fe0fb (diff)
By default, do not use proxy for localhost
-rw-r--r--ChangeLog1
-rw-r--r--dillorc2
-rw-r--r--src/prefs.c2
-rw-r--r--src/prefs.h1
4 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 72aaa568..22cd9562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@ dillo-2.2 [??]
- Allow linebreaks around Chinese/Japanese characters.
- Fix segfault in Html_parse_doctype (BUG#918).
- Change exit code used for bad command line argument.
+ - By default, do not use proxy for localhost (BUG 921).
Patches: corvid
-----------------------------------------------------------------------------
diff --git a/dillorc b/dillorc
index 43c06de8..2e0662d2 100644
--- a/dillorc
+++ b/dillorc
@@ -129,7 +129,7 @@
# Set the domains to access without proxy
# no_proxy = ".hola.com .mynet.cl .hi.de"
-#(by default, no proxy is used)
+#no_proxy="localhost 127.0.0.1"
# Set the HTTP Referer (sic) header.
# Note that there is no option to reveal the page that you came from because it
diff --git a/src/prefs.c b/src/prefs.c
index 4b8421cd..798729f4 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -53,7 +53,7 @@ void a_Prefs_init(void)
prefs.load_stylesheets=TRUE;
prefs.middle_click_drags_page = TRUE;
prefs.middle_click_opens_new_tab = TRUE;
- prefs.no_proxy = NULL;
+ prefs.no_proxy = dStrdup(PREFS_NO_PROXY);
prefs.panel_size = P_medium;
prefs.parse_embedded_css=TRUE;
prefs.save_dir = dStrdup(PREFS_SAVE_DIR);
diff --git a/src/prefs.h b/src/prefs.h
index da7a90a7..9067b564 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -30,6 +30,7 @@ extern "C" {
#define PREFS_FONT_FANTASY "DejaVu Sans" /* TODO: find good default */
#define PREFS_FONT_MONOSPACE "DejaVu Sans Mono"
#define PREFS_SEARCH_URL "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
+#define PREFS_NO_PROXY "localhost 127.0.0.1"
#define PREFS_SAVE_DIR "/tmp/"
#define PREFS_HTTP_REFERER "host"