diff options
Diffstat (limited to 'include/httpd.h')
| -rw-r--r-- | include/httpd.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/httpd.h b/include/httpd.h index 40351b79..81175280 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -154,9 +154,11 @@ extern "C" { #endif /** The path to the suExec wrapper, can be overridden in Configuration */ +#if !defined(NETWARE) && !defined(WIN32) #ifndef SUEXEC_BIN #define SUEXEC_BIN HTTPD_ROOT "/bin/suexec" #endif +#endif /** The timeout for waiting for messages */ #ifndef DEFAULT_TIMEOUT @@ -1448,13 +1450,21 @@ AP_DECLARE(int) ap_is_url(const char *u); AP_DECLARE(int) ap_unescape_url(char *url); /** - * Unescape a URL, but leaving %2f (slashes) escaped + * Unescape a URL, including encoded slashes. * @param url The url to unescape * @return 0 on success, non-zero otherwise */ AP_DECLARE(int) ap_unescape_url_keep2f(char *url); /** + * Unescape a URL, including encoded slashes. + * @param url The url to unescape + * @param decode_slashes Whether or not slashes should be decoded or not + * @return 0 on success, non-zero otherwise + */ +AP_DECLARE(int) ap_unescape_url_keep2f_ex(char *url, int decode_slashes); + +/** * Convert all double slashes to single slashes * @param name The string to convert */ |