From: Eric Covener Date: Tue, 14 Apr 2015 15:56:30 +0000 (+0000) Subject: libressl fix for removed ENGINE_CTRL_CHIL_SET_FORKCHECK X-Git-Tag: 2.5.0-alpha~3314 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de91f95a16b7eb19aed10d62cd33c7146ba82114;p=apache libressl fix for removed ENGINE_CTRL_CHIL_SET_FORKCHECK Submitted By: Stuart Henderson Commited By: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673455 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 7ca5e397a3..08ea8def8e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_ssl: Avoid compilation errors with LibreSSL related to + the use of ENGINE_CTRL_CHIL_SET_FORKCHECK. + [Stuart Henderson ] + *) ssl: Add a warning if protocol given in SSLProtocol or SSLProxyProtocol will override other parameters given in the same directive. This could be a missing + or - prefix. PR 52820 [Christophe Jaillet] diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index 34457250df..df775788e4 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -374,9 +374,11 @@ apr_status_t ssl_init_Engine(server_rec *s, apr_pool_t *p) return ssl_die(s); } +#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK if (strEQ(mc->szCryptoDevice, "chil")) { ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0); } +#endif if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01889)