Commit 27cc44b3 authored by Eric Covener's avatar Eric Covener
Browse files

Merge r1809135 from trunk: 

On the trunk:

mpm_common.h: guarding AP_ENABLE_EXCEPTION_HOOK against use when undefined so that -Wundef does not triggger.




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

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -131,11 +131,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     +1: jailletc36, ylavic (by inspection), covener

     jailletc36: untested, but looks straight forward enough to vote



   * core: maintainer mode fix for #if AP_ENABLE_EXCEPTION_HOOK

      trunk: http://svn.apache.org/r1809135

      2.4.x patch: svn merge -c 1809135 ^/httpd/httpd/trunk .

      +1: covener, rjung, jim



   *) core: allow quoted paths in <IfFile>

      trunk: http://svn.apache.org/r1797844

      2.4.x patch: svn merge -c 1797844 ^/httpd/httpd/trunk .

include/mpm_common.h

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ extern const char *ap_mpm_set_thread_stacksize(cmd_parms *cmd, void *dummy, 
extern void ap_core_child_status(server_rec *s, pid_t pid, ap_generation_t gen,

                                 int slot, mpm_child_status status);



#if AP_ENABLE_EXCEPTION_HOOK

#if defined(AP_ENABLE_EXCEPTION_HOOK) && AP_ENABLE_EXCEPTION_HOOK

extern const char *ap_mpm_set_exception_hook(cmd_parms *cmd, void *dummy,

                                             const char *arg);

#endif