From: Greg Ames <gregames@apache.org>
Date: Mon, 29 Jan 2001 22:19:17 +0000 (+0000)
Subject: back out recent breakage.  If the lstat isn't executed, finfo isn't
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=527c136ca9b7d8a7d5aa751fd652c6f9d04fb836;p=apache

back out recent breakage.  If the lstat isn't executed, finfo isn't
initialized, and the code was looking at random garbage.

This gets the server a little closer to starting on apache.org.  There's still
an issue with mod_include not resolving apr_get_username when it's dynamically
loaded.

Submitted by:	Jeff Trawick


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

diff --git a/server/config.c b/server/config.c
index 956add016b..ecfcc6b353 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1278,10 +1278,10 @@ void ap_process_resource_config(server_rec *s, const char *fname,
     /* 
      * here we want to check if the candidate file is really a
      * directory, and most definitely NOT a symlink (to prevent
-     * horrible loops).  So we do so above using apr_lstat.
-     * If so, let's recurse and toss it back into the function.
+     * horrible loops).  If so, let's recurse and toss it back 
+     * into the function.
      */
-    if (finfo.filetype == APR_DIR) {
+    if (ap_is_rdirectory(ptemp, fname)) {
         apr_dir_t *dirp;
         apr_finfo_t dirent;
 	int current;