X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=05d173e8af760a039e58019af3e6a0669eff4845;hp=59cea075033e87b5f0249714a18182269d04809e;hb=290114530161b0302d06f6934ce088771c272181;hpb=d66904675dddd63bab62e9e962cf195248a8bf97

diff --git a/surf.c b/surf.c
index 59cea07..05d173e 100644
--- a/surf.c
+++ b/surf.c
@@ -256,7 +256,7 @@ char *argv0;
 void
 usage(void)
 {
-	die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
+	die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvwxX] [-a cookiepolicies ] "
 	    "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
 	    "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
 }
@@ -792,14 +792,16 @@ setcert(Client *c, const char *uri)
 		return;
 	}
 
-	uri = strstr(uri, "://") + sizeof("://") - 1;
-	host = strndup(uri, strstr(uri, "/") - uri);
+	if ((uri = strstr(uri, "https://"))) {
+		uri += sizeof("https://") - 1;
+		host = g_strndup(uri, strchr(uri, '/') - uri);
+		webkit_web_context_allow_tls_certificate_for_host(
+		    webkit_web_view_get_context(c->view), cert, host);
+		g_free(host);
+	}
 
-	webkit_web_context_allow_tls_certificate_for_host(
-	    webkit_web_view_get_context(c->view), cert, host);
 	g_object_unref(cert);
 
-	free(host);
 }
 
 const char *
@@ -1005,7 +1007,7 @@ newview(Client *c, WebKitWebView *rv)
 		   "enable-site-specific-quirks", curconfig[SiteQuirks].val.b,
 		   "media-playback-requires-user-gesture", curconfig[MediaManualPlay].val.b,
 		   NULL);
-/* For mor interesting settings, have a look at
+/* For more interesting settings, have a look at
  * http://webkitgtk.org/reference/webkit2gtk/stable/WebKitSettings.html */
 
 		if (strcmp(fulluseragent, "")) {
@@ -1330,7 +1332,7 @@ loadfailedtls(WebKitWebView *v, gchar *uri, GTlsCertificate *cert,
 	g_object_get(cert, "certificate-pem", &pem, NULL);
 	html = g_strdup_printf("<p>Could not validate TLS for “%s”<br>%s</p>"
 	                       "<p>You can inspect the following certificate "
-	                       "with Ctrl+Shift+x (default keybinding).</p>"
+	                       "with Ctrl-t (default keybinding).</p>"
 	                       "<p><pre>%s</pre></p>", uri, errmsg->str, pem);
 	g_free(pem);
 	g_string_free(errmsg, TRUE);
@@ -1899,8 +1901,7 @@ main(int argc, char *argv[])
 		fulluseragent = EARGF(usage());
 		break;
 	case 'v':
-		die("surf-"VERSION", ©2009-2017 surf engineers, "
-		    "see LICENSE for details\n");
+		die("surf-"VERSION", see LICENSE for © details\n");
 	case 'w':
 		showxid = 1;
 		break;