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

libressl fix for removed ENGINE_CTRL_CHIL_SET_FORKCHECK

Browse Source 
Submitted By: Stuart Henderson <sthen openbsd.org>
Commited By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673455 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Covener
2015-04-14 15:56:30 +00:00
parent 593715fd4a
commit de91f95a16
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,6 +1,10 @@
-*- coding: utf-8 -*- -*- coding: utf-8 -*-
Changes with Apache 2.5.0 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 <sthen openbsd.org>]
*) ssl: Add a warning if protocol given in SSLProtocol or SSLProxyProtocol *) ssl: Add a warning if protocol given in SSLProtocol or SSLProxyProtocol
will override other parameters given in the same directive. This could be will override other parameters given in the same directive. This could be
a missing + or - prefix. PR 52820 [Christophe Jaillet] a missing + or - prefix. PR 52820 [Christophe Jaillet]

2
modules/ssl/ssl_engine_init.c
View File

@@ -374,9 +374,11 @@ apr_status_t ssl_init_Engine(server_rec *s, apr_pool_t *p)
return ssl_die(s); return ssl_die(s);
} }
#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
if (strEQ(mc->szCryptoDevice, "chil")) { if (strEQ(mc->szCryptoDevice, "chil")) {
ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0); ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
} }
#endif
if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01889) ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01889)