Bumping up to 0.7 for release.

Signed-off-by: Christoph Lohmann <20h@r-36.net>

config.def.h

@@ -17,7 +17,7 @@ static gfloat zoomlevel = 1.0;       /* Default zoom level */
 /* Soup default features */
 static char *cookiefile     = "~/.surf/cookies.txt";
 static char *cookiepolicies = "Aa@"; /* A: accept all; a: accept nothing,
-                                      * @: accept no third party */
+                                      * @: accept all except third party */
 static char *cafile         = "/etc/ssl/certs/ca-certificates.crt";
 static Bool strictssl       = FALSE; /* Refuse untrusted SSL connections */
 static time_t sessiontime   = 3600;

config.mk

@@ -1,5 +1,5 @@
 # surf version
-VERSION = 0.6
+VERSION = 0.7
 
 # Customize below to fit your system
 

surf.1

@@ -225,7 +225,7 @@ page.
 Toggle fullscreen mode.
 .SH INDICATORS OF OPERATION
 Surf is showing indicators of operation in front of the site title.
-For all indicators, unless otherwsie specified, a lower case letter means disabled and an upper case letter means enabled.
+For all indicators, unless otherwise specified, a lower case letter means disabled and an upper case letter means enabled.
 .TP
 .B A
 all cookies accepted
@@ -283,6 +283,13 @@ string
 .TP
 .B http_proxy
 If this variable is set and not empty upon startup, surf will use it as the http proxy
+.TP
+.B no_proxy
+If both http_proxy is set and no_proxy contain a
+.BR comma-separated
+list of domain extensions and both is not empty upon startup, proxy will
+.BR not
+be used for each of the elements in no_proxy.
 .SH PLUGINS
 For using plugins in surf, first determine your running architecture. Then get
 the appropriate plugin for that architecture and copy it to

surf.c

@@ -17,14 +17,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <webkit/webkit.h>
-#include <glib/gstdio.h>
 #include <JavaScriptCore/JavaScript.h>
 #include <sys/file.h>
 #include <libgen.h>
 #include <stdarg.h>
 #include <regex.h>
 #include <pwd.h>
-#include <string.h>
+#include <glib.h>
+#include <glib/gstdio.h>
 
 #include "arg.h"
 
@@ -803,6 +803,7 @@ loadstatuschange(WebKitWebView *view, GParamSpec *pspec, Client *c)
 			               & SOUP_MESSAGE_CERTIFICATE_TRUSTED);
 		}
 		setatom(c, AtomUri, uri);
+		c->title = copystr(&c->title, uri);
 
 		if (enablestyle)
 			setstyle(c, getstyle(uri));
@@ -1290,9 +1291,9 @@ void
 setup(void)
 {
 	int i;
-	char *proxy, *new_proxy;
+	char *proxy, *new_proxy, *no_proxy, **new_no_proxy;
 	char *styledirfile, *stylepath;
-	SoupURI *puri;
+	GProxyResolver *pr;
 	SoupSession *s;
 	GError *error = NULL;
 
@@ -1367,15 +1368,19 @@ setup(void)
 	/* proxy */
 	if ((proxy = getenv("http_proxy")) && strcmp(proxy, "")) {
 		new_proxy = g_strrstr(proxy, "http://")
+			    || g_strrstr(proxy, "https://")
 		            || g_strrstr(proxy, "socks://")
 		            || g_strrstr(proxy, "socks4://")
+		            || g_strrstr(proxy, "socks4a://")
 		            || g_strrstr(proxy, "socks5://")
 		            ? g_strdup(proxy)
 		            : g_strdup_printf("http://%s", proxy);
-		puri = soup_uri_new(new_proxy);
-		g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
-		soup_uri_free(puri);
+		new_no_proxy = ((no_proxy = getenv("no_proxy")) && strcmp(no_proxy, ""))
+			? g_strsplit(no_proxy, ",", -1) : NULL;
+		pr = g_simple_proxy_resolver_new(new_proxy, new_no_proxy);
+		g_object_set(G_OBJECT(s), "proxy-resolver", pr, NULL);
 		g_free(new_proxy);
+		g_strfreev(new_no_proxy);
 		usingproxy = 1;
 	}
 }