X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=f962fdfaaecee660c159d7a221db608efbf5bc2c;hp=a7678ae2408ca176b5f9f3dc47d73a8ff53681c9;hb=7b02dc68d5a7ac26f061ce3d84c26362130a1f45;hpb=c6ae2ae325d235baed559fa8227e278e96efc68c diff --git a/cgisimple.c b/cgisimple.c index a7678ae2..f962fdfa 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -6,7 +6,7 @@ * status. * * Copyright : Written by and Copyright (C) 2001-2017 the - * Privoxy team. http://www.privoxy.org/ + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -1365,7 +1365,7 @@ jb_err cgi_show_url_info(struct client_state *csp, if (url_param[0] == '\0') { - /* URL paramater not specified, display query form only. */ + /* URL parameter not specified, display query form only. */ free(url_param); if (map_block_killer(exports, "url-given") || map(exports, "url", 1, "", 1)) @@ -1438,11 +1438,14 @@ jb_err cgi_show_url_info(struct client_state *csp, } /* - * We have a warning about SSL paths. Hide it for unencrypted sites. + * We have a warning about SSL paths. Hide it for unencrypted sites + * and unconditionally if https inspection is enabled. */ +#ifndef FEATURE_HTTPS_INSPECTION if (!url_to_query->ssl) +#endif { - if (map_block_killer(exports, "https")) + if (map_block_killer(exports, "https-and-no-https-inspection")) { free_current_action(action); free_map(exports); @@ -1714,7 +1717,7 @@ jb_err cgi_robots_txt(struct client_state *csp, * * Function : show_defines * - * Description : Add to a map the state od all conditional #defines + * Description : Add to a map the state of all conditional #defines * used when building * * Parameters : @@ -1831,8 +1834,8 @@ static jb_err show_defines(struct map *exports) #endif }, { - "FEATURE_HTTPS_FILTERING", -#ifdef FEATURE_HTTPS_FILTERING + "FEATURE_HTTPS_INSPECTION", +#ifdef FEATURE_HTTPS_INSPECTION 1, #else 0,