Commit be3f791d authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Merge r1673455 from trunk: 

mod_ssl: Protect ENGINE_CTRL_CHIL_SET_FORKCHECK macro with a 
featue check for libressl.

Submitted by: Stuart Henderson <sthen openbsd.org>
Reviewed by: covener, trawick, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1673900 13f79535-47bb-0310-9956-ffa450edef68
parent d9be8fe2

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ Changes with Apache 2.4.13 
     calls r:wsupgrade() can cause a child process crash. 

     [Edward Lu <Chaosed0 gmail.com>]



  *) mod_ssl: Avoid compilation errors with LibreSSL related to

     the use of ENGINE_CTRL_CHIL_SET_FORKCHECK. 

     [Stuart Henderson <sthen openbsd.org>]



  *) mod_proxy_http: Use the "Connection: close" header for requests to

     backends not recycling connections (disablereuse), including the default

     reverse and forward proxies.  [Yann Ylavic]

STATUS

+0 −6
Changes for STATUS: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -105,12 +105,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_ssl: Protect ENGINE_CTRL_CHIL_SET_FORKCHECK macro with a 

     featue check for libressl. 

     trunk patch: http://svn.apache.org/r1673455

     2.4.x patch:  trunk works (modulo CHANGES)

     +1: covener, trawick, ylavic



  *) mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad

     Gateway) when no response is ever received from the backend.

     trunk patch: http://svn.apache.org/r1669299

modules/ssl/ssl_engine_init.c

+2 −0
Changes for modules/ssl/ssl_engine_init.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -353,9 +353,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)