diff options
| author | Yann Ylavic <ylavic@apache.org> | 2021-07-05 18:23:33 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2021-07-05 18:23:33 +0200 |
| commit | 20dd120ce4c0ea1329f6faef0bd3b13536e3c34c (patch) | |
| tree | 66270b7cf21250a71b6b584f206d78e1483724c3 /include | |
| parent | Sync CHANGES entries. (diff) | |
| download | apache2-20dd120ce4c0ea1329f6faef0bd3b13536e3c34c.tar.xz apache2-20dd120ce4c0ea1329f6faef0bd3b13536e3c34c.zip | |
mod_proxy: Avoid confusion of prefix/regex matching workers at loading. PR 65429.
ap_proxy_get_worker() needs to know whether it should lookup for prefix or
match or both matching workers, depending on the context.
For instance <Proxy[Match]> or ProxyPass[Match] directives need to lookup for
an existing worker with the same type as the directive (*Match or not), because
they will define one with that matching type if none exists.
On the contrary, "ProxySet <url>" at load time or ap_proxy_pre_request() at run
time need to find a worker matching an url whether it's by prefix or by regex.
So this commit adds ap_proxy_get_worker_ex() which takes a bitmask for the
matching type and calls it appropriately where needed.
For consistency, ap_proxy_define_worker_ex() is also added, using the same
bitmask flags, deprecating ap_proxy_define_match_worker().
Follow up to r1891206.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1891284 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index fee4381383..57166bae13 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -675,6 +675,8 @@ * 20210531.0 (2.5.1-dev) add conn_rec->outgoing and ap_ssl_bind_outgoing() * 20210531.1 (2.5.1-dev) Add ap_bucket_type_wc, ap_bucket_wc_make() and * ap_bucket_wc_create() to util_filter.h + * 20210531.2 (2.5.1-dev) Add ap_proxy_get_worker_ex() and + * ap_proxy_define_worker_ex() to mod_proxy.h */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ @@ -682,7 +684,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20210531 #endif -#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a |