From: Joe Orton <jorton@apache.org>
Date: Fri, 25 Aug 2023 07:44:08 +0000 (+0000)
Subject: * modules/dav/main/mod_dav.c (dav_get_resource): Don't mask
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=706af916933612750c1cf8f165e23d37c9b865b2;p=thirdparty%2Fapache%2Fhttpd.git

* modules/dav/main/mod_dav.c (dav_get_resource): Don't mask
  "conf" variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1911906 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index a86581b42f9..44b6d79f5bd 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -831,9 +831,9 @@ DAV_DECLARE(dav_error *) dav_get_resource(request_rec *r, int label_allowed,
         /* In the error path, give a hint that DavBasePath needs to be
          * used if the location was configured via a regex match. */
         if (!conf->base) {
-            core_dir_config *conf = ap_get_core_module_config(r->per_dir_config);
+            core_dir_config *cdc = ap_get_core_module_config(r->per_dir_config);
 
-            if (conf->r) {
+            if (cdc->r) {
                 ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, APLOGNO(10484)
                              "failed to find repository for location configured "
                              "via regex match - missing DAVBasePath?");