From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 23 Aug 2001 21:58:07 +0000 (+0000)
Subject:   Whoops.  To explain, we won't dup filename unless it really didn't match
X-Git-Tag: 2.0.25~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa07a7d9e7a275dc89d42867a17ef858dde53a14;p=apache

  Whoops.  To explain, we won't dup filename unless it really didn't match
  in the first place.  We are about to abuse test_filename, so don't try
  using that copy.


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

diff --git a/server/request.c b/server/request.c
index ce07b05151..bc85191132 100644
--- a/server/request.c
+++ b/server/request.c
@@ -505,8 +505,8 @@ AP_DECLARE(int) directory_walk(request_rec *r)
             return HTTP_FORBIDDEN;
         }
         if (strcmp(r->filename, test_filename) != 0)
-            r->filename = apr_pstrdup(test_filename);
-        r->canonical_filename = r->test_filename;
+            r->filename = apr_pstrdup(r->pool, test_filename);
+        r->canonical_filename = r->filename;
     }
 
     num_dirs = ap_count_dirs(test_filename);