Commit 5d2e3ca5 authored by Joe Orton's avatar Joe Orton
Browse files

* 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
parent 7e5f4a6d

modules/ssl/ssl_engine_config.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -904,8 +904,14 @@ const char *ssl_cmd_SSLCipherSuite(cmd_parms *cmd, 
static const char *ssl_cmd_check_file(cmd_parms *parms,

static const char *ssl_cmd_check_file(cmd_parms *parms,

                                      const char **file)

                                      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) {

    if (!filepath) {

        return apr_pstrcat(parms->pool, parms->cmd->name,

        return apr_pstrcat(parms->pool, parms->cmd->name,

                           ": Invalid file path ", *file, NULL);

                           ": Invalid file path ", *file, NULL);