diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2014-03-29 21:56:19 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2014-03-29 21:56:45 +0100 |
| commit | 2a463b3cd73c32ee9dcd508248d0194923f435f4 (patch) | |
| tree | 2ff478255a77a55031056790918b6f983bb7b20a /modules/ssl/ssl_scache.c | |
| parent | 86d5cc79d9d6750da8771fdb0c9ab22c19b8ad45 (diff) | |
| download | apache2-2a463b3cd73c32ee9dcd508248d0194923f435f4.tar.gz | |
Imported Upstream version 2.4.9upstream/2.4.9
Diffstat (limited to 'modules/ssl/ssl_scache.c')
| -rw-r--r-- | modules/ssl/ssl_scache.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/ssl/ssl_scache.c b/modules/ssl/ssl_scache.c index bfed6e7c..01f72546 100644 --- a/modules/ssl/ssl_scache.c +++ b/modules/ssl/ssl_scache.c @@ -37,7 +37,7 @@ ** _________________________________________________________________ */ -void ssl_scache_init(server_rec *s, apr_pool_t *p) +apr_status_t ssl_scache_init(server_rec *s, apr_pool_t *p) { SSLModConfigRec *mc = myModConfig(s); apr_status_t rv; @@ -49,7 +49,7 @@ void ssl_scache_init(server_rec *s, apr_pool_t *p) * will be immediately cleared anyway. For every subsequent * invocation, initialize the configured cache. */ if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) - return; + return APR_SUCCESS; #ifdef HAVE_OCSP_STAPLING if (mc->stapling_cache) { @@ -63,7 +63,7 @@ void ssl_scache_init(server_rec *s, apr_pool_t *p) if (rv) { ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01872) "Could not initialize stapling cache. Exiting."); - ssl_die(s); + return ssl_die(s); } } #endif @@ -76,7 +76,7 @@ void ssl_scache_init(server_rec *s, apr_pool_t *p) ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(01873) "Init: Session Cache is not configured " "[hint: SSLSessionCache]"); - return; + return APR_SUCCESS; } memset(&hints, 0, sizeof hints); @@ -88,8 +88,10 @@ void ssl_scache_init(server_rec *s, apr_pool_t *p) if (rv) { ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01874) "Could not initialize session cache. Exiting."); - ssl_die(s); + return ssl_die(s); } + + return APR_SUCCESS; } void ssl_scache_kill(server_rec *s) |