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

mod_ssl: follow up to r1740928: fix memory leaks.

Browse Source 
[Reverted by r1781311]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1781188 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2017-01-31 23:39:58 +00:00
parent 120f9ee886
commit ad6088c88d
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ssl/ssl_engine_init.c
View File

@@ -1617,6 +1617,11 @@ static apr_status_t ssl_init_proxy_ctx(server_rec *s,
{
apr_status_t rv;
if (proxy->ssl_ctx) {
/* Merged/initialized already */
return APR_SUCCESS;
}
apr_pool_cleanup_register(p, proxy,
ssl_cleanup_proxy_ctx,
apr_pool_cleanup_null);
@@ -1687,7 +1692,6 @@ static apr_status_t ssl_init_server_ctx(server_rec *s,
ssl_log_ssl_error(SSLLOG_MARK, APLOG_EMERG, s);
return ssl_die(s);
}
SSL_CONF_CTX_free(cctx);
#endif
if (SSL_CTX_check_private_key(sc->server->ssl_ctx) != 1) {