From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 16 Oct 2001 02:19:42 +0000 (+0000)
Subject:   directory_walk trounced existing path_info declarations.  I suspect _this_
X-Git-Tag: 2.0.26~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75ed984cc7d23a2676737b452efff1b2d80f67ba;p=apache

  directory_walk trounced existing path_info declarations.  I suspect _this_
  was Greg Ames bug...


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

diff --git a/server/request.c b/server/request.c
index cf55c476a2..ad59065247 100644
--- a/server/request.c
+++ b/server/request.c
@@ -543,7 +543,11 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r)
         opts_remove = this_dir->opts_remove;
         override = this_dir->override;
 
-        r->path_info = r->filename;
+        /* XXX: Remerge path_info, or we are broken.  Needs more thought.
+         */
+        if (r->path_info)
+            r->path_info = ap_make_full_path(r->pool, r->filename, 
+                                                      r->path_info);
         rv = apr_filepath_root((const char **)&r->filename,
                                (const char **)&r->path_info,
                                APR_FILEPATH_TRUENAME, r->pool);