summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2024-08-01 13:35:26 +0200
committerYann Ylavic <ylavic@apache.org>2024-08-01 13:35:26 +0200
commit2f1f9c5df027e86bf4c3dbdb96c9e52748421c20 (patch)
treee186b3c9ffbb791eb7091d003f03f5b8d5a276fc /include
parentFollow-up to r1919587: CMake: Fix type in variable name (MODULES_SYNMBOLS -> ... (diff)
downloadapache2-2f1f9c5df027e86bf4c3dbdb96c9e52748421c20.tar.xz
apache2-2f1f9c5df027e86bf4c3dbdb96c9e52748421c20.zip
mod_proxy: Fix selection of ProxyPassMatch workers with host/port substitution. PR 69233.
With "ProxyPassMatch ^/([^/]+)/(.*)$ https://$1/$2", ap_proxy_get_worker_ex() should not consider the length of scheme://host part of the given URL because of the globbing match on the host part. Fix it by setting worker->s>is_host_matchable when creating a worker with host substitution and avoiding the min_match check in worker_matches() in this case. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919617 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-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 ad4b77bd33..c9ae4c157c 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -731,6 +731,7 @@
* and AP_REQUEST_TRUSTED_CT BNOTE.
* 20211221.24 (2.5.1-dev) Add ap_proxy_fixup_uds_filename()
* 20211221.25 (2.5.1-dev) AP_SLASHES and AP_IS_SLASH
+ * 20211221.26 (2.5.1-dev) Add is_host_matchable to proxy_worker_shared
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -738,7 +739,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20211221
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 25 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 26 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a