summaryrefslogtreecommitdiffstats
path: root/include/ap_mmn.h
diff options
context:
space:
mode:
authorRuediger Pluem <rpluem@apache.org>2023-03-13 11:24:30 +0100
committerRuediger Pluem <rpluem@apache.org>2023-03-13 11:24:30 +0100
commit2fa15c2c06213dc516a5383faa4bce3c74b9286a (patch)
treec1e52339f902c0ef594e99cc55562f207adb5955 /include/ap_mmn.h
parentStop dumping error_log on failure, since is is now captured (diff)
downloadapache2-2fa15c2c06213dc516a5383faa4bce3c74b9286a.tar.xz
apache2-2fa15c2c06213dc516a5383faa4bce3c74b9286a.zip
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
Diffstat (limited to 'include/ap_mmn.h')
-rw-r--r--include/ap_mmn.h3
1 files changed, 2 insertions, 1 deletions
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