X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=310303439a41d51a60e3d92f90f31499e131cb04;hp=4339ecd01199a8baeaf64cca8628c95d2742d6b6;hb=574e03526a57195008f8e4ce4df81b33daf7e027;hpb=1a3ce9d8821ddcf8ca6fa67a966052f7a0a6b20a diff --git a/cgisimple.c b/cgisimple.c index 4339ecd0..31030343 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -260,7 +260,13 @@ jb_err cgi_show_request(struct client_state *csp, } if (map(exports, "processed-request", 1, - html_encode_and_free_original(list_to_text(csp->headers)), 0)) + html_encode_and_free_original( +#ifdef FEATURE_HTTPS_INSPECTION + csp->http->ssl ? + list_to_text(csp->https_headers) : +#endif + list_to_text(csp->headers) + ), 0)) { free_map(exports); return JB_ERR_MEMORY; @@ -404,6 +410,7 @@ jb_err cgi_show_client_tags(struct client_state *csp, snprintf(buf, sizeof(buf), "%u", csp->config->client_tag_lifetime); if (map(exports, "refresh-delay", 1, buf, 1)) { + freez(client_tag_status); free_map(exports); return JB_ERR_MEMORY; } @@ -413,6 +420,7 @@ jb_err cgi_show_client_tags(struct client_state *csp, err = map_block_killer(exports, "tags-expire"); if (err != JB_ERR_OK) { + freez(client_tag_status); return err; } } @@ -1280,26 +1288,28 @@ jb_err cgi_show_status(struct client_state *csp, #endif /* ndef FEATURE_STATISTICS */ #ifdef FEATURE_EXTENDED_STATISTICS + if (!err) { char *block_reason_statistics = get_block_reason_statistics_table(csp); if (block_reason_statistics != NULL) { - if (!err) err = map(exports, "block-reason-statistics", 1, block_reason_statistics, 0); + err = map(exports, "block-reason-statistics", 1, block_reason_statistics, 0); } else { - if (!err) err = map_block_killer(exports, "extended-statistics"); + err = map_block_killer(exports, "extended-statistics"); } } + if (!err) { char *filter_statistics = get_filter_statistics_table(csp); if (filter_statistics != NULL) { - if (!err) err = map(exports, "filter-statistics", 1, filter_statistics, 0); + err = map(exports, "filter-statistics", 1, filter_statistics, 0); } else { - if (!err) err = map_block_killer(exports, "extended-statistics"); + err = map_block_killer(exports, "extended-statistics"); } } #else /* ndef FEATURE_EXTENDED_STATISTICS */ @@ -1346,9 +1356,9 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = string_append(&s, "\n"); } } - if (*s != '\0') + if (!err && *s != '\0') { - if (!err) err = map(exports, "actions-filenames", 1, s, 0); + err = map(exports, "actions-filenames", 1, s, 0); } else { @@ -1373,9 +1383,9 @@ jb_err cgi_show_status(struct client_state *csp, if (!err) err = string_append(&s, "\n"); } } - if (*s != '\0') + if (!err && *s != '\0') { - if (!err) err = map(exports, "re-filter-filenames", 1, s, 0); + err = map(exports, "re-filter-filenames", 1, s, 0); } else { @@ -2092,6 +2102,22 @@ static jb_err show_defines(struct map *exports) 1, #else 0, +#endif + }, + { + "FEATURE_EXTENDED_STATISTICS", +#ifdef FEATURE_EXTENDED_STATISTICS + 1, +#else + 0, +#endif + }, + { + "FEATURE_PCRE_HOST_PATTERNS", +#ifdef FEATURE_PCRE_HOST_PATTERNS + 1, +#else + 0, #endif } };