www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Reaction to Jeff Trawick's observations that we are double-initializing

Browse Source 
dynalinked OpenSSL Engines and Configs.  Move the library teardown code
  so that it is torn down in the proper order, corresponding to when the
  library itself was initialized.  And leave a little reminder that some
  memory diagnostics would be good if OpenSSL is built for malloc debugging.

Suggested by: Geoff Thorpe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100288 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2003-06-17 17:44:40 +00:00
parent e8292fc3f3
commit 1e0682040d
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/ssl/mod_ssl.c
View File

@@ -230,6 +230,34 @@ static const command_rec ssl_config_cmds[] = {
/* /*
* the various processing hooks * the various processing hooks
*/ */
static apr_status_t ssl_cleanup_pre_config(void *data)
{
/*
* Try to kill the internals of the SSL library.
*/
#ifdef OPENSSL_VERSION_NUMBER
#if OPENSSL_VERSION_NUMBER >= 0x00907001
/* Corresponds to OPENSSL_load_builtin_modules():
* XXX: borrowed from apps.h, but why not CONF_modules_free()
* which also invokes CONF_modules_finish()?
*/
CONF_modules_unload(1);
#endif
#endif
/* Corresponds to SSL_library_init: */
EVP_cleanup();
#if HAVE_ENGINE_LOAD_BUILTIN_ENGINES
ENGINE_cleanup();
#endif
CRYPTO_cleanup_all_ex_data();
ERR_remove_state(0);
ERR_free_strings();
/*
* TODO: determine somewhere we can safely shove out diagnostics
* (when enabled) at this late stage in the game:
* CRYPTO_mem_leaks_fp(stderr);
*/
}
static int ssl_hook_pre_config(apr_pool_t *pconf, static int ssl_hook_pre_config(apr_pool_t *pconf,
apr_pool_t *plog, apr_pool_t *plog,
@@ -251,6 +279,12 @@ static int ssl_hook_pre_config(apr_pool_t *pconf,
#endif #endif
SSL_load_error_strings(); SSL_load_error_strings();
/*
* Let us cleanup the ssl library when the module is unloaded
*/
apr_pool_cleanup_register(pconf, NULL, ssl_cleanup_pre_config,
apr_pool_cleanup_null);
/* Register us to handle mod_log_config %c/%x variables */ /* Register us to handle mod_log_config %c/%x variables */
ssl_var_log_config_register(pconf); ssl_var_log_config_register(pconf);
#if 0 /* XXX */ #if 0 /* XXX */

7
modules/ssl/ssl_engine_init.c
View File

@@ -1251,13 +1251,6 @@ apr_status_t ssl_init_ModuleKill(void *data)
ssl_init_ctx_cleanup_server(sc->server); ssl_init_ctx_cleanup_server(sc->server);
} }
/*
* Try to kill the internals of the SSL library.
*/
ERR_free_strings();
ERR_remove_state(0);
EVP_cleanup();
return APR_SUCCESS; return APR_SUCCESS;
} }