X-Git-Url: https://git.danieliu.xyz/?p=surf.git;a=blobdiff_plain;f=surf.c;h=e08bfe5468969c51a6289a027e5426df46bf571c;hp=40c7fe486648e02351a2fccf013da8722202575c;hb=27cec484084f37e01cadcdf7ea92c64de71e0b34;hpb=0247e91b0067c715b19dedd7a3012624ee61576a diff --git a/surf.c b/surf.c index 40c7fe4..e08bfe5 100644 --- a/surf.c +++ b/surf.c @@ -80,7 +80,7 @@ typedef enum { SiteQuirks, SpellChecking, SpellLanguages, - StrictSSL, + StrictTLS, Style, ZoomLevel, ParameterLast, @@ -226,7 +226,7 @@ static void clicknewwindow(Client *c, const Arg *a, WebKitHitTestResult *h); static void clickexternplayer(Client *c, const Arg *a, WebKitHitTestResult *h); static char winid[64]; -static char togglestats[10]; +static char togglestats[11]; static char pagestats[2]; static Atom atoms[AtomLast]; static Window embed; @@ -569,7 +569,8 @@ gettogglestats(Client *c) togglestats[6] = curconfig[Plugins].val.b ? 'V' : 'v'; togglestats[7] = curconfig[Style].val.b ? 'M' : 'm'; togglestats[8] = curconfig[FrameFlattening].val.b ? 'F' : 'f'; - togglestats[9] = '\0'; + togglestats[9] = curconfig[StrictTLS].val.b ? 'T' : 't'; + togglestats[10] = '\0'; } void @@ -710,12 +711,12 @@ setparameter(Client *c, int refresh, ParamName p, const Arg *a) return; /* do not update */ case SpellLanguages: return; /* do nothing */ - case StrictSSL: + case StrictTLS: webkit_web_context_set_tls_errors_policy( webkit_web_view_get_context(c->view), a->b ? WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE); - return; /* do not update */ + break; case Style: if (a->b) setstyle(c, getstyle(geturi(c))); @@ -960,9 +961,9 @@ newview(Client *c, WebKitWebView *rv) * or one for each view */ webkit_web_context_set_process_model(context, WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); - /* ssl */ + /* TLS */ webkit_web_context_set_tls_errors_policy(context, - curconfig[StrictSSL].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL : + curconfig[StrictTLS].val.b ? WEBKIT_TLS_ERRORS_POLICY_FAIL : WEBKIT_TLS_ERRORS_POLICY_IGNORE); /* disk cache */ webkit_web_context_set_cache_model(context, @@ -1679,6 +1680,9 @@ main(int argc, char *argv[]) case 'c': cookiefile = EARGF(usage()); break; + case 'C': + stylefile = EARGF(usage()); + break; case 'd': defconfig CSETB(DiskCache, 0); break; @@ -1739,9 +1743,6 @@ main(int argc, char *argv[]) case 'S': defconfig CSETB(JavaScript, 1); break; - case 't': - stylefile = EARGF(usage()); - break; case 'u': fulluseragent = EARGF(usage()); break;