From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 19 Jun 2020 17:30:24 +0000 (+0000)
Subject: ap_proxy_define_match_worker: disable connection reuse by default.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1368
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b092ff988f7e184485c50a41c9e1bd2fef269cb0;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 59b77aa7c32..b7ec07a5173 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;
 }