void
usage(void)
{
- die("usage: %s [-bBdDfFgGiIkKmMnNpPsStTvx] [-a cookiepolicies ] "
- "[-c cookiefile] [-C stylefile] [-e xid] [-r scriptfile] "
- "[-u useragent] [-z zoomlevel] [uri]\n", basename(argv0));
+ die("usage: surf [-bBdDfFgGiIkKmMnNpPsStTvwxX]\n"
+ "[-a cookiepolicies ] [-c cookiefile] [-C stylefile] [-e xid]\n"
+ "[-r scriptfile] [-u useragent] [-z zoomlevel] [uri]\n");
}
void
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 *
"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, "")) {
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);
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;