summaryrefslogtreecommitdiffstats
path: root/surf.c
diff options
context:
space:
mode:
Diffstat (limited to 'surf.c')
-rw-r--r--surf.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/surf.c b/surf.c
index 093bdf4..7b71f0e 100644
--- a/surf.c
+++ b/surf.c
@@ -80,6 +80,7 @@ static char winid[64];
static gboolean usingproxy = 0;
static char togglestat[7];
static char pagestat[3];
+static GTlsDatabase *tlsdb;
static void addaccelgroup(Client *c);
static void beforerequest(WebKitWebView *w, WebKitWebFrame *f,
@@ -1044,6 +1045,7 @@ setup(void) {
char *new_proxy;
SoupURI *puri;
SoupSession *s;
+ GError *error = NULL;
/* clean up any zombies immediately */
sigchld(0);
@@ -1070,7 +1072,13 @@ setup(void) {
FALSE)));
/* ssl */
- g_object_set(G_OBJECT(s), "ssl-ca-file", cafile, NULL);
+ tlsdb = g_tls_file_database_new(cafile, &error);
+
+ if (error) {
+ g_warning("Error loading SSL database %s: %s", cafile, error->message);
+ g_error_free(error);
+ }
+ g_object_set(G_OBJECT(s), "tls-database", tlsdb, NULL);
g_object_set(G_OBJECT(s), "ssl-strict", strictssl, NULL);
/* proxy */
100'>2016-02-23arg.h: fixed argv checks orderGravatar Lucas Gabriel Vuotto 1-2/+2 2016-01-14TypofixGravatar Klemens Nanni 1-1/+1 2015-12-19Shut up glibc about _BSD_SOURCE being deprecatedGravatar Quentin Rameau 1-1/+1 2015-12-19Add config option for word delimitersGravatar Quentin Rameau 2-2/+10 2015-11-08arg.h: remove unused ARGNUM* macrosGravatar Hiltjo Posthuma 1-14/+0 2015-11-08unboolify dmenuGravatar Hiltjo Posthuma 2-9/+7 2015-11-08Makefile: package config.def.h on make distGravatar Hiltjo Posthuma 1-2/+3 2015-11-08remove .hgtags fileGravatar Hiltjo Posthuma 1-49/+0 2015-11-07dmenu.1: clarify monitor numbers are starting from 0 (first mon)Gravatar Hiltjo Posthuma 1-1/+2 2015-11-07fix: multimon: always spawn client on first monitor if specified with -m 0Gravatar Hiltjo Posthuma 1-1/+1 2015-10-20drw: cleanup drw_text, prevent gcc warning false-positive of unused varGravatar Hiltjo Posthuma 1-21/+14 2015-10-20drw: simplify drw_font_xcreate and prevent a potential unneeded allocationGravatar Hiltjo Posthuma 1-22/+19 2015-10-20drw: a valid (non-NULL) Drw and Fnt context must be passedGravatar Hiltjo Posthuma 1-16/+3 2015-10-20add sbase-style ecalloc(), calloc: or dieGravatar Hiltjo Posthuma 3-12/+18 2015-10-18free schemes as arrayGravatar Hiltjo Posthuma 1-6/+6 2015-10-04fix input text matchingGravatar Quentin Rameau 1-1/+1 2015-10-04fix incorrect ordering of match resultsGravatar Davide Del Zompo 1-2/+3 2015-10-04fix paste from clipboard (ctrl+shift+y)Gravatar Hiltjo Posthuma 1-0/+1 2015-09-28minor style fixGravatar Hiltjo Posthuma 1-1/+2 2015-09-28Remove function prototypes and reorder functions accordinglyGravatar FRIGN 1-80/+64 2015-09-28Untypedef struct itemGravatar FRIGN 1-10/+9 2015-09-28Fix the conversion from microseconds to nanosecondsGravatar Quentin Rameau 1-1/+1 2015-09-28Replace deprecated usleep() with nanosleep()Gravatar Quentin Rameau 1-2/+3 2015-09-28config.mk: use -std=c99Gravatar Hiltjo Posthuma 1-1/+1 2015-09-27dmenu: style improvementsGravatar Hiltjo Posthuma 1-204/+213 2015-09-27drw style improvementsGravatar Hiltjo Posthuma 2-93/+106 2015-09-27separate program-specific c99 bool and X11Gravatar Hiltjo Posthuma 2-11/+10 2015-09-27config.mk: fix _XOPEN_SOURCE=700 for getline()Gravatar Hiltjo Posthuma 1-1/+1 2015-09-27config.mk: improve feature test checkGravatar Hiltjo Posthuma 1-1/+1 2015-08-06Fixed typo introduced by shared codeGravatar Eric Pruitt 1-1/+1 2015-07-19stest: get rid of getopt, use suckless arg.hGravatar Hiltjo Posthuma 3-53/+141 2015-07-19config.mk: add FREETYPELIBS and FREETYPEINCGravatar Hiltjo Posthuma 1-3/+9 2015-07-19fix prompt color style how it used to beGravatar Hiltjo Posthuma 1-1/+1 2015-06-27Use libdraw: add Xft and fallback-fonts support to graphics libGravatar Hiltjo Posthuma 11-316/+684 2014-09-17applied Hiltjo's patch as suggested on the ml to fix ControlMask for C-j and C-mGravatar Anselm R Garbe 2-2/+5 2014-07-30fix crash with ctrl-enter as inputGravatar Hiltjo Posthuma 1-1/+2 2014-05-29updated copyright notices in LICENSE and dmenu.c fileGravatar Anselm R Garbe 2-2/+2 2013-08-13applied Martin Kühl's inverse matching flag to stestGravatar Anselm R Garbe 2-4/+7 2013-08-02applied Martti Kühne's dmenu monitor patchGravatar Anselm R Garbe 3-4/+14 2013-06-28accepted vi'is exit approach ^[ (suggested by Arkaduisz)Gravatar Anselm R Garbe 1-0/+2 93b682e214748d1810fc6254452&follow=1'>Make »Copy image address« work.Gravatar Christoph Lohmann 1-3/+10 Thanks yui@blekksprut.net for the patch! 2014-08-07Mention xdotool in SEE ALSO too.Gravatar Christoph Lohmann 1-1/+2 2014-08-07Fix the manpage about xid.Gravatar Christoph Lohmann 1-1/+3 Something was missing from this one sentence. Now it is complete.