iproxy-uri -> proxy-resolver for no_proxy; add #inc - surf - Surf web browser.	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
1Log	/scm/surf//log.gph	gopher.r-36.net	70
1Files	/scm/surf//files.gph	gopher.r-36.net	70
1Refs	/scm/surf//refs.gph	gopher.r-36.net	70
1README	/scm/surf//file/README.gph	gopher.r-36.net	70
1LICENSE	/scm/surf//file/LICENSE.gph	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1commit 86efaf80936cebba56ec3e88db61c786c608c885	/scm/surf//commit/86efaf80936cebba56ec3e88db61c786c608c885.gph	gopher.r-36.net	70
1parent 9fa4ffef72308e75446aeeebc9d38140b7198640	/scm/surf//commit/9fa4ffef72308e75446aeeebc9d38140b7198640.gph	gopher.r-36.net	70
hAuthor: Ivan Tham <pickfire@riseup.net>	URL:mailto:pickfire@riseup.net	gopher.r-36.net	70
iDate:   Thu, 17 Dec 2015 21:35:02 +0800	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iproxy-uri -> proxy-resolver for no_proxy; add #inc	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iSigned-off-by: Christoph Lohmann <20h@r-36.net>	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
iDiffstat:	Err	gopher.r-36.net	70
i  surf.1                              |       7 +++++++	Err	gopher.r-36.net	70
i  surf.c                              |      17 ++++++++++++-----	Err	gopher.r-36.net	70
i	Err	gopher.r-36.net	70
i2 files changed, 19 insertions(+), 5 deletions(-)	Err	gopher.r-36.net	70
i---	Err	gopher.r-36.net	70
1diff --git a/surf.1 b/surf.1	/scm/surf//file/surf.1.gph	gopher.r-36.net	70
i@@ -283,6 +283,13 @@ string	Err	gopher.r-36.net	70
i .TP	Err	gopher.r-36.net	70
i .B http_proxy	Err	gopher.r-36.net	70
i If this variable is set and not empty upon startup, surf will use it as the http proxy	Err	gopher.r-36.net	70
i+.TP	Err	gopher.r-36.net	70
i+.B no_proxy	Err	gopher.r-36.net	70
i+If both http_proxy is set and no_proxy contain a	Err	gopher.r-36.net	70
i+.BR comma-separated	Err	gopher.r-36.net	70
i+list of domain extensions and both is not empty upon startup, proxy will	Err	gopher.r-36.net	70
i+.BR not	Err	gopher.r-36.net	70
i+be used for each of the elements in no_proxy.	Err	gopher.r-36.net	70
i .SH PLUGINS	Err	gopher.r-36.net	70
i For using plugins in surf, first determine your running architecture. Then get	Err	gopher.r-36.net	70
i tthe appropriate plugin for that architecture and copy it to	Err	gopher.r-36.net	70
1diff --git a/surf.c b/surf.c	/scm/surf//file/surf.c.gph	gopher.r-36.net	70
i@@ -24,6 +24,9 @@	Err	gopher.r-36.net	70
i #include <stdarg.h>	Err	gopher.r-36.net	70
i #include <regex.h>	Err	gopher.r-36.net	70
i #include <pwd.h>	Err	gopher.r-36.net	70
i+#include <glib.h>	Err	gopher.r-36.net	70
i+#include <lib/gprintf.h>	Err	gopher.r-36.net	70
i+#include <gio/gio.h>	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i #include "arg.h"	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i@@ -1290,9 +1293,9 @@ void	Err	gopher.r-36.net	70
i setup(void)	Err	gopher.r-36.net	70
i {	Err	gopher.r-36.net	70
i         int i;	Err	gopher.r-36.net	70
i-        char *proxy, *new_proxy;	Err	gopher.r-36.net	70
i+        char *proxy, *new_proxy, *no_proxy, **new_no_proxy;	Err	gopher.r-36.net	70
i         char *styledirfile, *stylepath;	Err	gopher.r-36.net	70
i-        SoupURI *puri;	Err	gopher.r-36.net	70
i+        GProxyResolver *pr;	Err	gopher.r-36.net	70
i         SoupSession *s;	Err	gopher.r-36.net	70
i         GError *error = NULL;	Err	gopher.r-36.net	70
i 	Err	gopher.r-36.net	70
i@@ -1367,15 +1370,19 @@ setup(void)	Err	gopher.r-36.net	70
i         /* proxy */	Err	gopher.r-36.net	70
i         if ((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {	Err	gopher.r-36.net	70
i                 new_proxy = g_strrstr(proxy, "http://")	Err	gopher.r-36.net	70
i+                            || g_strrstr(proxy, "https://")	Err	gopher.r-36.net	70
i                             || g_strrstr(proxy, "socks://")	Err	gopher.r-36.net	70
i                             || g_strrstr(proxy, "socks4://")	Err	gopher.r-36.net	70
i+                            || g_strrstr(proxy, "socks4a://")	Err	gopher.r-36.net	70
i                             || g_strrstr(proxy, "socks5://")	Err	gopher.r-36.net	70
i                             ? g_strdup(proxy)	Err	gopher.r-36.net	70
i                             : g_strdup_printf("http://%s", proxy);	Err	gopher.r-36.net	70
i-                puri = soup_uri_new(new_proxy);	Err	gopher.r-36.net	70
i-                g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);	Err	gopher.r-36.net	70
i-                soup_uri_free(puri);	Err	gopher.r-36.net	70
i+                new_no_proxy = ((no_proxy = getenv("no_proxy")) && strcmp(no_proxy, ""))	Err	gopher.r-36.net	70
i+                        ? g_strsplit(no_proxy, ",", -1) : NULL;	Err	gopher.r-36.net	70
i+                pr = g_simple_proxy_resolver_new(new_proxy, new_no_proxy);	Err	gopher.r-36.net	70
i+                g_object_set(G_OBJECT(s), "proxy-resolver", pr, NULL);	Err	gopher.r-36.net	70
i                 g_free(new_proxy);	Err	gopher.r-36.net	70
i+                g_strfreev(new_no_proxy);	Err	gopher.r-36.net	70
i                 usingproxy = 1;	Err	gopher.r-36.net	70
i         }	Err	gopher.r-36.net	70
i }	Err	gopher.r-36.net	70
.