From: Joe Orton <jorton@apache.org>
Date: Thu, 13 Jun 2019 15:34:28 +0000 (+0000)
Subject: * modules/ssl/ssl_engine_config.c (ssl_cmd_check_file):
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62126124e1dfe146b0902608f0e6b80bb4d8ced8;p=apache

* modules/ssl/ssl_engine_config.c (ssl_cmd_check_file):
  If dumping the config, don't validate the paths.  Allows
  e.g. "httpd -L" to work w/ certs configured but not present,
  doesn't affect "httpd -t".


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

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 3ded454b4c..26f8723f07 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -904,8 +904,14 @@ const char *ssl_cmd_SSLCipherSuite(cmd_parms *cmd,
 static const char *ssl_cmd_check_file(cmd_parms *parms,
                                       const char **file)
 {
-    const char *filepath = ap_server_root_relative(parms->pool, *file);
+    const char *filepath;
 
+    /* If only dumping the config, don't verify the paths */
+    if (ap_state_query(AP_SQ_RUN_MODE) == AP_SQ_RM_CONFIG_DUMP) {
+        return NULL;
+    }
+
+    filepath = ap_server_root_relative(parms->pool, *file);
     if (!filepath) {
         return apr_pstrcat(parms->pool, parms->cmd->name,
                            ": Invalid file path ", *file, NULL);