You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2020/05/04 08:37:41 UTC

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

Author: jorton
Date: Mon May  4 08:37:40 2020
New Revision: 1877346

URL: http://svn.apache.org/viewvc?rev=1877346&view=rev
Log:
* modules/ssl/ssl_engine_config.c (ssl_config_global_create):
  apr_pcalloc SSLModConfigRec, remove ifdef-maze setting fields to zero.

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=1877346&r1=1877345&r2=1877346&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Mon May  4 08:37:40 2020
@@ -53,33 +53,15 @@ static SSLModConfigRec *ssl_config_globa
         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