From 3e2123609c1d0df222d0766817572d99d135bf2d Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 4 May 2020 08:37:40 +0000 Subject: [PATCH] * modules/ssl/ssl_engine_config.c (ssl_config_global_create): apr_pcalloc SSLModConfigRec, remove ifdef-maze setting fields to zero. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1877346 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_config.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index b106e1467d2..bb2dbedd212 100644 --- a/modules/ssl/ssl_engine_config.c +++ b/modules/ssl/ssl_engine_config.c @@ -53,33 +53,15 @@ static SSLModConfigRec *ssl_config_global_create(apr_pool_t *pool, server_rec *s return sc->mc; } - /* - * allocate an own subpool which survives server restarts - */ - mc = (SSLModConfigRec *)apr_palloc(pool, sizeof(*mc)); + mc = apr_pcalloc(pool, sizeof(*mc)); mc->pPool = pool; - mc->bFixed = FALSE; /* * initialize per-module configuration */ mc->sesscache_mode = SSL_SESS_CACHE_OFF; - mc->sesscache = NULL; - mc->pMutex = NULL; mc->aRandSeed = apr_array_make(pool, 4, sizeof(ssl_randseed_t)); -#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT) - mc->szCryptoDevice = NULL; -#endif -#ifdef HAVE_OCSP_STAPLING - mc->stapling_cache = NULL; - mc->stapling_cache_mutex = NULL; - mc->stapling_refresh_mutex = NULL; -#endif - -#ifdef HAVE_OPENSSL_KEYLOG - mc->keylog_file = NULL; -#endif #ifdef HAVE_FIPS mc->fips = UNSET; #endif -- 2.47.3