summaryrefslogtreecommitdiffstats
path: root/modules/proxy/proxy_util.c
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2020-06-19 19:30:24 +0200
committerYann Ylavic <ylavic@apache.org>2020-06-19 19:30:24 +0200
commitb092ff988f7e184485c50a41c9e1bd2fef269cb0 (patch)
tree07e715afb5cd5fb86b3dba04c77eedd22f91d9b1 /modules/proxy/proxy_util.c
parentap_proxy_define_match_worker: don't copy the url unnecessarily. (diff)
downloadapache2-b092ff988f7e184485c50a41c9e1bd2fef269cb0.tar.xz
apache2-b092ff988f7e184485c50a41c9e1bd2fef269cb0.zip
ap_proxy_define_match_worker: disable connection reuse by default.
To avoid compat issues with dns/connection reuse now that a worker with dollar substitution can be elected. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879000 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy/proxy_util.c')
-rw-r--r--modules/proxy/proxy_util.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 59b77aa7c3..b7ec07a517 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1962,6 +1962,16 @@ PROXY_DECLARE(char *) ap_proxy_define_match_worker(apr_pool_t *p,
}
(*worker)->s->is_name_matchable = 1;
+ if (pdollar) {
+ /* Before ap_proxy_define_match_worker() existed, a regex worker
+ * with dollar substitution was never matched against the actual
+ * URL thus the request fell through the generic worker. To avoid
+ * dns and connection reuse compat issues, let's disable connection
+ * reuse by default, it can still be overwritten by an explicit
+ * enablereuse=on.
+ */
+ (*worker)->s->disablereuse = 1;
+ }
return NULL;
}