Commit 81cca93a authored by Ian Holsman's avatar Ian Holsman
Browse files

Modify post_config hook so that it can return a error, 

causing the server not to start.
previous method was to call exit(1) which would not fail
gracefully

PR:
Obtained from:
Submitted by:
Reviewed by:	(Idea only Jeff Trawick)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@92144 13f79535-47bb-0310-9956-ffa450edef68
parent f648ad3b

mod_ssl.h

+1 −1
Changes for mod_ssl.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ const char *ssl_cmd_SSLProxyMachineCertificateFile(cmd_parms *, char *, char *) 
#endif



/*  module initialization  */

void         ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);

int          ssl_init_Module(apr_pool_t *, apr_pool_t *, apr_pool_t *, server_rec *);

void         ssl_init_SSLLibrary(void);

void         ssl_init_Engine(server_rec *, apr_pool_t *);

void         ssl_init_TmpKeysHandle(int, server_rec *, apr_pool_t *);

ssl_engine_init.c

+3 −3
Changes for ssl_engine_init.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
/*

 *  Per-module initialization

 */

void ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,

int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,

    apr_pool_t *ptemp, server_rec *s)

{

    SSLModConfigRec *mc = myModConfig(s);
@@ -191,7 +191,7 @@ void ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, 
    if (mc->nInitCount == 1) {

        ssl_pphrase_Handle(s, p);

        ssl_init_TmpKeysHandle(SSL_TKP_GEN, s, p);

        return;

        return OK;

    }



    /*
@@ -265,7 +265,7 @@ void ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, 
    ap_add_version_component(p, ssl_var_lookup(p, s, NULL, NULL, "SSL_VERSION_LIBRARY"));



    SSL_init_app_data2_idx(); /* for SSL_get_app_data2() at request time */

    return;

    return OK;

}



/*