From: Eric Covener <covener@apache.org>
Date: Wed, 1 Jun 2022 12:38:03 +0000 (+0000)
Subject: Merge r1901504 from trunk:
X-Git-Tag: 2.4.54-rc1-candidate~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=801e414cb3e4af20d225fcc7e81bfb77c559fee9;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1901504 from trunk:

mod_isapi: use consistent filename


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901505 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/arch/win32/mod_isapi.c b/modules/arch/win32/mod_isapi.c
index 5592a5744e9..a9816e5c0de 100644
--- a/modules/arch/win32/mod_isapi.c
+++ b/modules/arch/win32/mod_isapi.c
@@ -976,11 +976,11 @@ static int APR_THREAD_FUNC regfnServerSupportFunction(isapi_cid    *cid,
             return 0;
         }
 
-        len = (apr_uint32_t)strlen(r->filename);
+        len = (apr_uint32_t)strlen(subreq->filename);
 
         if ((subreq->finfo.filetype == APR_DIR)
               && (!subreq->path_info)
-              && (file[len - 1] != '/'))
+              && (subreq->filename[len - 1] != '/'))
             file = apr_pstrcat(cid->r->pool, subreq->filename, "/", NULL);
         else
             file = apr_pstrcat(cid->r->pool, subreq->filename,