Issue a warning for non-existent directories when running configtest

Submitted By: Stéphane Blondon <stephane.blondon gmail.com>
Committed By: covener



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

1 files changed, 9 insertions, 0 deletions

diff --git a/server/core.c b/server/core.c
index 3a00761b76..1b6c98251a 100644
--- a/server/core.c
+++ b/server/core.c
@@ -2532,6 +2532,7 @@ static const char *dirsection(cmd_parms *cmd, void *mconfig, const char *arg)
     }
     else if (strcmp(cmd->path, "/") != 0)
     {
+        int run_mode = ap_state_query(AP_SQ_RUN_MODE);
         char *newpath;
 
         /*
@@ -2544,6 +2545,14 @@ static const char *dirsection(cmd_parms *cmd, void *mconfig, const char *arg)
                                "\"> path is invalid.", NULL);
         }
 
+        if (run_mode == AP_SQ_RM_CONFIG_TEST &&
+            !ap_is_directory(cmd->temp_pool, cmd->path)) {
+            ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0,
+                          cmd->temp_pool, APLOGNO(10234)
+                          "Warning: <Directory \"%s\"> does not exist or is not a directory",
+                          cmd->path);
+        }
+
         cmd->path = newpath;
         if (cmd->path[strlen(cmd->path) - 1] != '/')
             cmd->path = apr_pstrcat(cmd->pool, cmd->path, "/", NULL);