From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 22 Mar 2016 17:38:20 +0000 (+0000)
Subject: core: Add missing AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST.
X-Git-Tag: 2.5.0-alpha~1843
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=958ef399d680e712a9218525f12ba7933b9eb40f;p=thirdparty%2Fapache%2Fhttpd.git

core: Add missing AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1736217 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/ap_hooks.h b/include/ap_hooks.h
index 43d38e7da7f..72cbb7a2c8e 100644
--- a/include/ap_hooks.h
+++ b/include/ap_hooks.h
@@ -112,7 +112,7 @@
  * @param decline The "decline" return value
  * @return ok, decline or an error.
  * @note If IMPLEMENTing a hook that is not linked into the Apache core,
- * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL.
+ * (e.g. within a dso) use AP_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL instead.
  */
 #define AP_IMPLEMENT_HOOK_RUN_ALL(ret,name,args_decl,args_use,ok,decline) \
         APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl, \
@@ -132,7 +132,7 @@
  * @param decline The "decline" return value
  * @return decline or an error.
  * @note If IMPLEMENTing a hook that is not linked into the Apache core
- * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST.
+ * (e.g. within a dso) use AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST instead.
  */
 #define AP_IMPLEMENT_HOOK_RUN_FIRST(ret,name,args_decl,args_use,decline) \
         APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl, \
@@ -152,6 +152,16 @@
         APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl, \
                                             args_use,ok,decline)
 
+/**
+ * Implement an optional hook. This is exactly the same as a standard hook
+ * implementation, except the hook is optional.
+ * @see AP_IMPLEMENT_HOOK_RUN_FIRST
+ */
+#define AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST(ret,name,args_decl,args_use, \
+                                             decline) \
+        APR_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl, \
+                                              args_use,decline)
+
 /**
  * Hook an optional hook. Unlike static hooks, this uses a macro instead of a
  * function.
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 177a1aa1ac3..bec6d14efc5 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -518,6 +518,7 @@
  *                         ap_mpm_register_poll_callback_timeout and
  *                         ap_mpm_unregister_poll_callback. Add
  *                         AP_MPMQ_CAN_POLL.
+ * 20160315.1 (2.5.0-dev)  Add AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST.
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */