From 2fa15c2c06213dc516a5383faa4bce3c74b9286a Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Mon, 13 Mar 2023 10:24:30 +0000 Subject: Do not double encode encoded slashes In case that AllowEncodedSlashes is set to NoDecode do not double encode encoded slashes in the URL sent by the reverse proxy to the backend. * include/ap_mmn.h: Document the addition of ap_proxy_canonenc_ex to the API. * modules/proxy/mod_proxy.h: Declare ap_proxy_canonenc_ex and define flag values. * modules/proxy/proxy_util.c: Implement ap_proxy_canonenc_ex by modifying ap_proxy_canonenc accordingly and reimplement ap_proxy_canonenc to use ap_proxy_canonenc_ex with the appropriate flag. * modules/http2/mod_proxy_http2.c, modules/proxy/mod_proxy_*.c: Set the correct flag based on the AllowEncodedSlashes configuration and use ap_proxy_canonenc_ex instead of ap_proxy_canonenc. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908341 13f79535-47bb-0310-9956-ffa450edef68 --- include/ap_mmn.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/ap_mmn.h') diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 2f5a935a62..2c36bddcfe 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -712,6 +712,7 @@ * 20211221.7 (2.5.1-dev) Add ap_h1_append_header() * 20211221.8 (2.5.1-dev) Add ap_sb_get_child_thread() * 20211221.9 (2.5.1-dev) Add additional hcmethod_t enums and PROXY_WORKER_IS_ERROR + * 20211221.10 (2.5.1-dev) Add ap_proxy_canonenc_ex */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ @@ -719,7 +720,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20211221 #endif -#define MODULE_MAGIC_NUMBER_MINOR 9 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 10 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a -- cgit v1.2.3