projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
373171c
)
Unconditionally use CGI_PREFIX where possible
author
Fabian Keil
<fk@fabiankeil.de>
Sat, 12 Dec 2020 22:57:12 +0000
(23:57 +0100)
committer
Fabian Keil
<fk@fabiankeil.de>
Mon, 14 Dec 2020 07:49:17 +0000
(08:49 +0100)
cgi.c
patch
|
blob
|
history
diff --git
a/cgi.c
b/cgi.c
index
e03084e
..
53587e9
100644
(file)
--- a/
cgi.c
+++ b/
cgi.c
@@
-2216,11
+2216,7
@@
struct map *default_exports(const struct client_state *csp, const char *caller)
if (!err) err = map(exports, "homepage", 1, html_encode(HOME_PAGE_URL), 0);
if (!err)
{
if (!err) err = map(exports, "homepage", 1, html_encode(HOME_PAGE_URL), 0);
if (!err)
{
- err = map(exports, "default-cgi", 1, html_encode(
-#ifdef FEATURE_HTTPS_INSPECTION
- client_use_ssl(csp) ? CGI_PREFIX_HTTPS :
-#endif
- CGI_PREFIX), 0);
+ err = map(exports, "default-cgi", 1, html_encode(CGI_PREFIX), 0);
}
if (!err) err = map(exports, "menu", 1, make_menu(csp, caller), 0);
if (!err) err = map(exports, "code-status", 1, CODE_STATUS, 1);
}
if (!err) err = map(exports, "menu", 1, make_menu(csp, caller), 0);
if (!err) err = map(exports, "code-status", 1, CODE_STATUS, 1);
@@
-2235,11
+2231,7
@@
struct map *default_exports(const struct client_state *csp, const char *caller)
/* Manual is delivered by Privoxy. */
if (!err)
{
/* Manual is delivered by Privoxy. */
if (!err)
{
- err = map(exports, "user-manual", 1, html_encode(
-#ifdef FEATURE_HTTPS_INSPECTION
- client_use_ssl(csp) ? CGI_PREFIX_HTTPS"user-manual/" :
-#endif
- CGI_PREFIX"user-manual/"), 0);
+ err = map(exports, "user-manual", 1, html_encode(CGI_PREFIX"user-manual/"), 0);
}
}
if (!err) err = map(exports, "actions-help-prefix", 1, ACTIONS_HELP_PREFIX ,1);
}
}
if (!err) err = map(exports, "actions-help-prefix", 1, ACTIONS_HELP_PREFIX ,1);
@@
-2457,11
+2449,7
@@
char *make_menu(const struct client_state *csp, const char *self)
* the "blocked" template's JavaScript.
*/
string_append(&result, "<li><a href=\"");
* the "blocked" template's JavaScript.
*/
string_append(&result, "<li><a href=\"");
- html_encoded_prefix = html_encode(
-#ifdef FEATURE_HTTPS_INSPECTION
- client_use_ssl(csp) ? CGI_PREFIX_HTTPS :
-#endif
- CGI_PREFIX);
+ html_encoded_prefix = html_encode(CGI_PREFIX);
if (html_encoded_prefix == NULL)
{
return NULL;
if (html_encoded_prefix == NULL)
{
return NULL;