From 5688505d984766f78a19f78de5cd56b0fe21539f Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 18 Apr 2014 15:25:21 +0000 Subject: [PATCH] Merge r1546835, r1546836 from trunk: Follow-up to r1546759: Fix compilation when exception hooks aren't enabled. avoid duplication of APR_HOOK_LINK invocations Submitted by: trawick Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588491 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 4 ---- server/mpm_common.c | 32 ++++++++++++++------------------ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/STATUS b/STATUS index b1cbc4141f..ae21292c03 100644 --- a/STATUS +++ b/STATUS @@ -96,10 +96,6 @@ CURRENT RELEASE NOTES: RELEASE SHOWSTOPPERS: - * Fix build breakage when exception hooks aren't enabled - trunk patch: r1546835, r1546836 - 2.4.x patch: http://people.apache.org/~trawick/no_exception_hook_breakage.txt - +1: trawick, ylavic, jim PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] diff --git a/server/mpm_common.c b/server/mpm_common.c index 3b8e4ebccf..a598010682 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -62,32 +62,28 @@ #undef APLOG_MODULE_INDEX #define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX +#define DEFAULT_HOOK_LINKS \ + APR_HOOK_LINK(monitor) \ + APR_HOOK_LINK(drop_privileges) \ + APR_HOOK_LINK(mpm) \ + APR_HOOK_LINK(mpm_query) \ + APR_HOOK_LINK(mpm_register_timed_callback) \ + APR_HOOK_LINK(mpm_get_name) \ + APR_HOOK_LINK(end_generation) \ + APR_HOOK_LINK(child_status) \ + APR_HOOK_LINK(suspend_connection) \ + APR_HOOK_LINK(resume_connection) + #if AP_ENABLE_EXCEPTION_HOOK APR_HOOK_STRUCT( APR_HOOK_LINK(fatal_exception) - APR_HOOK_LINK(monitor) - APR_HOOK_LINK(drop_privileges) - APR_HOOK_LINK(mpm) - APR_HOOK_LINK(mpm_query) - APR_HOOK_LINK(mpm_register_timed_callback) - APR_HOOK_LINK(mpm_get_name) - APR_HOOK_LINK(end_generation) - APR_HOOK_LINK(child_status) - APR_HOOK_LINK(suspend_connection) - APR_HOOK_LINK(resume_connection) + DEFAULT_HOOK_LINKS ) AP_IMPLEMENT_HOOK_RUN_ALL(int, fatal_exception, (ap_exception_info_t *ei), (ei), OK, DECLINED) #else APR_HOOK_STRUCT( - APR_HOOK_LINK(monitor) - APR_HOOK_LINK(drop_privileges) - APR_HOOK_LINK(mpm) - APR_HOOK_LINK(mpm_query) - APR_HOOK_LINK(mpm_register_timed_callback) - APR_HOOK_LINK(mpm_get_name) - APR_HOOK_LINK(end_generation) - APR_HOOK_LINK(child_status) + DEFAULT_HOOK_LINKS ) #endif AP_IMPLEMENT_HOOK_RUN_ALL(int, monitor, -- 2.50.1