From e91cfc8e476c45c5c3ed87040033672fc1faab35 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Wed, 27 Jun 2007 15:39:56 +0000 Subject: Add ca_path option which sets CURLOPT_CAPATH. svn path=/trunk/netsurf/; revision=3369 --- content/fetchers/fetch_curl.c | 2 ++ desktop/options.c | 3 +++ desktop/options.h | 1 + 3 files changed, 6 insertions(+) diff --git a/content/fetchers/fetch_curl.c b/content/fetchers/fetch_curl.c index 96517b659..3d8423b61 100644 --- a/content/fetchers/fetch_curl.c +++ b/content/fetchers/fetch_curl.c @@ -1344,6 +1344,8 @@ void register_curl_fetchers(void) if (option_ca_bundle) SETOPT(CURLOPT_CAINFO, option_ca_bundle); + if (option_ca_path) + SETOPT(CURLOPT_CAPATH, option_ca_path); /* cURL initialised okay, register the fetchers */ diff --git a/desktop/options.c b/desktop/options.c index 659c5b78a..12867e00c 100644 --- a/desktop/options.c +++ b/desktop/options.c @@ -87,6 +87,8 @@ int option_expire_url = 28; int option_font_default = CSS_FONT_FAMILY_SANS_SERIF; /** ca-bundle location */ char *option_ca_bundle = 0; +/** ca-path location */ +char *option_ca_path = 0; /** Cookie file location */ char *option_cookie_file = 0; /** Cookie jar loaction */ @@ -161,6 +163,7 @@ struct { { "expire_url", OPTION_INTEGER, &option_expire_url }, { "font_default", OPTION_INTEGER, &option_font_default }, { "ca_bundle", OPTION_STRING, &option_ca_bundle }, + { "ca_path", OPTION_STRING, &option_ca_path }, { "cookie_file", OPTION_STRING, &option_cookie_file }, { "cookie_jar", OPTION_STRING, &option_cookie_jar }, { "homepage_url", OPTION_STRING, &option_homepage_url }, diff --git a/desktop/options.h b/desktop/options.h index a394204ec..8ecc0c407 100644 --- a/desktop/options.h +++ b/desktop/options.h @@ -55,6 +55,7 @@ extern char *option_font_mono; extern char *option_font_cursive; extern char *option_font_fantasy; extern char *option_ca_bundle; +extern char *option_ca_path; extern char *option_cookie_file; extern char *option_cookie_jar; extern char *option_homepage_url; -- cgit v1.2.3