I'm trying to update OpenBSD's port of Apache HTTPD to the 2.4 series. This is the first in a small series of diffs from the OpenBSD ports tree. I hope OpenBSD will eventually be able to drop its custom patches. If you're at ApacheCon in Austin this week please feel free to talk to me in person.
mod_ssl unconditionally uses a macro related to the "chil" engine, which has been removed from LibreSSL. Guard use of this macro based on its presence. Patch by Stuart Henderson, obtained by me from the OpenBSD ports tree. http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/www/apache-httpd/patches/patch-modules_ssl_ssl_engine_init_c?rev=1.1&content-type=text/x-cvsweb-markup Index: modules/ssl/ssl_engine_init.c =================================================================== --- modules/ssl/ssl_engine_init.c (revision 1673296) +++ modules/ssl/ssl_engine_init.c (working copy) @@ -374,9 +374,11 @@ 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)
