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 5592a5744e96b79d42108ec23fe95cf4e7e597fa..a9816e5c0de981c23c267f0b9bc1c39059deb39a 100644 (file)
--- 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,