You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2016/03/22 18:38:20 UTC
svn commit: r1736217 - in /httpd/httpd/trunk/include: ap_hooks.h ap_mmn.h
Author: ylavic
Date: Tue Mar 22 17:38:20 2016
New Revision: 1736217
URL: http://svn.apache.org/viewvc?rev=1736217&view=rev
Log:
core: Add missing AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST.
Modified:
httpd/httpd/trunk/include/ap_hooks.h
httpd/httpd/trunk/include/ap_mmn.h
Modified: httpd/httpd/trunk/include/ap_hooks.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_hooks.h?rev=1736217&r1=1736216&r2=1736217&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_hooks.h (original)
+++ httpd/httpd/trunk/include/ap_hooks.h Tue Mar 22 17:38:20 2016
@@ -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, \
@@ -153,6 +153,16 @@
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.
*/
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1736217&r1=1736216&r2=1736217&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Tue Mar 22 17:38:20 2016
@@ -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" */
Re: svn commit: r1736217 - in /httpd/httpd/trunk/include: ap_hooks.h
ap_mmn.h
Posted by Ruediger Pluem <rp...@apache.org>.
On 03/24/2016 12:59 PM, Jeff Trawick wrote:
> On Thu, Mar 24, 2016 at 5:56 AM, Ruediger Pluem <rpluem@apache.org <ma...@apache.org>> wrote:
>
>
>
> On 03/22/2016 06:38 PM, ylavic@apache.org <ma...@apache.org> wrote:
> > Author: ylavic
> > Date: Tue Mar 22 17:38:20 2016
> > New Revision: 1736217
> >
> > URL: http://svn.apache.org/viewvc?rev=1736217&view=rev
> > Log:
> > core: Add missing AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST.
> >
> > Modified:
> > httpd/httpd/trunk/include/ap_hooks.h
> > httpd/httpd/trunk/include/ap_mmn.h
> >
> > Modified: httpd/httpd/trunk/include/ap_hooks.h
>
> > Modified: httpd/httpd/trunk/include/ap_mmn.h
> > URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1736217&r1=1736216&r2=1736217&view=diff
> > ==============================================================================
> > --- httpd/httpd/trunk/include/ap_mmn.h (original)
> > +++ httpd/httpd/trunk/include/ap_mmn.h Tue Mar 22 17:38:20 2016
> > @@ -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" */
> >
> >
> >
>
> You forgot the real bump :-)
>
>
> Remembering to do the real bump is the exception :)
>
There is a test in the test suite covering this. This is how I found this btw. :-)
Regards
Rüdiger
Re: svn commit: r1736217 - in /httpd/httpd/trunk/include: ap_hooks.h ap_mmn.h
Posted by Jeff Trawick <tr...@gmail.com>.
On Thu, Mar 24, 2016 at 5:56 AM, Ruediger Pluem <rp...@apache.org> wrote:
>
>
> On 03/22/2016 06:38 PM, ylavic@apache.org wrote:
> > Author: ylavic
> > Date: Tue Mar 22 17:38:20 2016
> > New Revision: 1736217
> >
> > URL: http://svn.apache.org/viewvc?rev=1736217&view=rev
> > Log:
> > core: Add missing AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST.
> >
> > Modified:
> > httpd/httpd/trunk/include/ap_hooks.h
> > httpd/httpd/trunk/include/ap_mmn.h
> >
> > Modified: httpd/httpd/trunk/include/ap_hooks.h
>
> > Modified: httpd/httpd/trunk/include/ap_mmn.h
> > URL:
> http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1736217&r1=1736216&r2=1736217&view=diff
> >
> ==============================================================================
> > --- httpd/httpd/trunk/include/ap_mmn.h (original)
> > +++ httpd/httpd/trunk/include/ap_mmn.h Tue Mar 22 17:38:20 2016
> > @@ -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" */
> >
> >
> >
>
> You forgot the real bump :-)
>
Remembering to do the real bump is the exception :)
Maybe we need a commit hook???
>
> Regards
>
> Rüdiger
>
>
--
Born in Roswell... married an alien...
http://emptyhammock.com/
Re: svn commit: r1736217 - in /httpd/httpd/trunk/include: ap_hooks.h ap_mmn.h
Posted by Yann Ylavic <yl...@gmail.com>.
On Thu, Mar 24, 2016 at 10:56 AM, Ruediger Pluem <rp...@apache.org> wrote:
>
> You forgot the real bump :-)
Thanks :) fixed in r1736428.
Re: svn commit: r1736217 - in /httpd/httpd/trunk/include: ap_hooks.h
ap_mmn.h
Posted by Ruediger Pluem <rp...@apache.org>.
On 03/22/2016 06:38 PM, ylavic@apache.org wrote:
> Author: ylavic
> Date: Tue Mar 22 17:38:20 2016
> New Revision: 1736217
>
> URL: http://svn.apache.org/viewvc?rev=1736217&view=rev
> Log:
> core: Add missing AP_IMPLEMENT_OPTIONAL_HOOK_RUN_FIRST.
>
> Modified:
> httpd/httpd/trunk/include/ap_hooks.h
> httpd/httpd/trunk/include/ap_mmn.h
>
> Modified: httpd/httpd/trunk/include/ap_hooks.h
> Modified: httpd/httpd/trunk/include/ap_mmn.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1736217&r1=1736216&r2=1736217&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/include/ap_mmn.h (original)
> +++ httpd/httpd/trunk/include/ap_mmn.h Tue Mar 22 17:38:20 2016
> @@ -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" */
>
>
>
You forgot the real bump :-)
Regards
Rüdiger