httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1781311 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_config.c ssl_engine_init.c
Date Wed, 01 Feb 2017 21:17:20 GMT
Author: ylavic
Date: Wed Feb  1 21:17:20 2017
New Revision: 1781311

URL: http://svn.apache.org/viewvc?rev=1781311&view=rev
Log:
mod_ssl: revert r1781299 r1781188.
Need to separate follow up related to r1740928 and co from the one related to
r1781187.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_init.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=1781311&r1=1781310&r2=1781311&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Wed Feb  1 21:17:20 2017
@@ -98,14 +98,6 @@ BOOL ssl_config_global_isfixed(SSLModCon
 **  _________________________________________________________________
 */
 
-#ifdef HAVE_SSL_CONF_CMD
-static apr_status_t modssl_ctx_config_cleanup(void *ctx)
-{
-    SSL_CONF_CTX_free(ctx);
-    return APR_SUCCESS;
-}
-#endif
-
 static void modssl_ctx_init(modssl_ctx_t *mctx, apr_pool_t *p)
 {
     mctx->sc                  = NULL; /* set during module init */
@@ -165,9 +157,6 @@ static void modssl_ctx_init(modssl_ctx_t
 #endif
 #ifdef HAVE_SSL_CONF_CMD
     mctx->ssl_ctx_config = SSL_CONF_CTX_new();
-    apr_pool_cleanup_register(p, mctx->ssl_ctx_config,
-                              modssl_ctx_config_cleanup,
-                              apr_pool_cleanup_null);
     SSL_CONF_CTX_set_flags(mctx->ssl_ctx_config, SSL_CONF_FLAG_FILE);
     SSL_CONF_CTX_set_flags(mctx->ssl_ctx_config, SSL_CONF_FLAG_SERVER);
     SSL_CONF_CTX_set_flags(mctx->ssl_ctx_config, SSL_CONF_FLAG_CERTIFICATE);

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?rev=1781311&r1=1781310&r2=1781311&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Wed Feb  1 21:17:20 2017
@@ -1615,11 +1615,6 @@ static apr_status_t ssl_init_proxy_ctx(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);
@@ -1690,6 +1685,7 @@ static apr_status_t ssl_init_server_ctx(
             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) {



Mime
View raw message