svn commit: r1861269 - /httpd/httpd/trunk/modules/ssl/ssl_engine_config.c

[jo...@apache.org]

Author: jorton
Date: Thu Jun 13 15:34:28 2019
New Revision: 1861269

URL: http://svn.apache.org/viewvc?rev=1861269&view=rev
Log:
* 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".

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?rev=1861269&r1=1861268&r2=1861269&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Thu Jun 13 15:34:28 2019
@@ -904,8 +904,14 @@ const char *ssl_cmd_SSLCipherSuite(cmd_p
 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);