projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow to use extended host patterns and vanilla host patterns at the same time
[privoxy.git]
/
cgisimple.c
diff --git
a/cgisimple.c
b/cgisimple.c
index
0148120
..
3be01e3
100644
(file)
--- a/
cgisimple.c
+++ b/
cgisimple.c
@@
-1365,7
+1365,7
@@
jb_err cgi_show_url_info(struct client_state *csp,
if (url_param[0] == '\0')
{
if (url_param[0] == '\0')
{
- /* URL param
a
ter not specified, display query form only. */
+ /* URL param
e
ter not specified, display query form only. */
free(url_param);
if (map_block_killer(exports, "url-given")
|| map(exports, "url", 1, "", 1))
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)
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);
{
free_current_action(action);
free_map(exports);
@@
-1714,7
+1717,7
@@
jb_err cgi_robots_txt(struct client_state *csp,
*
* Function : show_defines
*
*
* Function : show_defines
*
- * Description : Add to a map the state o
d
all conditional #defines
+ * Description : Add to a map the state o
f
all conditional #defines
* used when building
*
* Parameters :
* used when building
*
* Parameters :
@@
-1756,6
+1759,14
@@
static jb_err show_defines(struct map *exports)
1,
#else
0,
1,
#else
0,
+#endif
+ },
+ {
+ "FEATURE_BROTLI",
+#ifdef FEATURE_BROTLI
+ 1,
+#else
+ 0,
#endif
},
{
#endif
},
{