You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2013/12/01 19:51:04 UTC
svn commit: r1546836 - /httpd/httpd/trunk/server/mpm_common.c
Author: trawick
Date: Sun Dec 1 18:51:04 2013
New Revision: 1546836
URL: http://svn.apache.org/r1546836
Log:
avoid duplication of APR_HOOK_LINK invocations
Modified:
httpd/httpd/trunk/server/mpm_common.c
Modified: httpd/httpd/trunk/server/mpm_common.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=1546836&r1=1546835&r2=1546836&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_common.c (original)
+++ httpd/httpd/trunk/server/mpm_common.c Sun Dec 1 18:51:04 2013
@@ -62,38 +62,30 @@
#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_register_socket_callback) \
+ APR_HOOK_LINK(mpm_unregister_socket_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_register_socket_callback)
- APR_HOOK_LINK(mpm_unregister_socket_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_register_socket_callback)
- APR_HOOK_LINK(mpm_unregister_socket_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
)
#endif
AP_IMPLEMENT_HOOK_RUN_ALL(int, monitor,