You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Yann Ylavic <yl...@gmail.com> on 2017/11/06 12:10:00 UTC
Re: svn commit: r1811930 - in /httpd/httpd/branches/2.4.x: STATUS patches/backport-module-flags.diff
On Thu, Oct 12, 2017 at 11:45 AM, <ic...@apache.org> wrote:
> Author: icing
> Date: Thu Oct 12 09:45:35 2017
> New Revision: 1811930
>
> URL: http://svn.apache.org/viewvc?rev=1811930&view=rev
> Log:
> proposing new module flag backport
>
[]
>
> Added: httpd/httpd/branches/2.4.x/patches/backport-module-flags.diff
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/patches/backport-module-flags.diff?rev=1811930&view=auto
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/patches/backport-module-flags.diff (added)
> +++ httpd/httpd/branches/2.4.x/patches/backport-module-flags.diff Thu Oct 12 09:45:35 2017
> @@ -0,0 +1,171 @@
> +Index: include/ap_mmn.h
> +===================================================================
> +--- include/ap_mmn.h (revision 1811919)
> ++++ include/ap_mmn.h (working copy)
> +@@ -496,6 +496,8 @@
> + * to ap_[r]getline()
> + * 20120211.68 (2.4.26-dev) Add ap_get_basic_auth_components() and deprecate
> + * ap_get_basic_auth_pw()
> ++ * 20120211.69 (2.4.29-dev) Add flags field to module_struct and function
> ++ * ap_get_module_flags()
> + */
> +
> + #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
> +@@ -503,7 +505,7 @@
> + #ifndef MODULE_MAGIC_NUMBER_MAJOR
> + #define MODULE_MAGIC_NUMBER_MAJOR 20120211
> + #endif
> +-#define MODULE_MAGIC_NUMBER_MINOR 68 /* 0...n */
> ++#define MODULE_MAGIC_NUMBER_MINOR 69 /* 0...n */
> +
> + /**
> + * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
> +Index: include/http_config.h
> +===================================================================
> +--- include/http_config.h (revision 1811919)
> ++++ include/http_config.h (working copy)
[]
> +@@ -519,6 +528,21 @@
> + AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
> + void *val);
> +
> ++/**
> ++ * When module flags have been introduced, and a way to check this.
> ++ */
> ++#define AP_MODULE_FLAGS_MMN_MAJOR 20161018
> ++#define AP_MODULE_FLAGS_MMN_MINOR 7
> ++#define AP_MODULE_HAS_FLAGS(m) \
> ++ AP_MODULE_MAGIC_AT_LEAST(AP_MODULE_FLAGS_MMN_MAJOR, \
> ++ AP_MODULE_FLAGS_MMN_MINOR)
For 2.4.x, I think AP_MODULE_FLAGS_MMN_MAJOR and
AP_MODULE_FLAGS_MMN_MINOR should be the ones (in 2.4.x) at the time of
this backport, i.e. (per ap_mmn.h change above):
+#define AP_MODULE_FLAGS_MMN_MAJOR 20120211
+#define AP_MODULE_FLAGS_MMN_MINOR 69
I'm still +1 for a "backport-module-flags-v2.diff" with this change ;)
Re: svn commit: r1811930 - in /httpd/httpd/branches/2.4.x: STATUS
patches/backport-module-flags.diff
Posted by Stefan Eissing <st...@greenbytes.de>.
Thanks for the review! Updated the patch.
-Stefan
> Am 06.11.2017 um 13:10 schrieb Yann Ylavic <yl...@gmail.com>:
>
> On Thu, Oct 12, 2017 at 11:45 AM, <ic...@apache.org> wrote:
>> Author: icing
>> Date: Thu Oct 12 09:45:35 2017
>> New Revision: 1811930
>>
>> URL: http://svn.apache.org/viewvc?rev=1811930&view=rev
>> Log:
>> proposing new module flag backport
>>
> []
>>
>> Added: httpd/httpd/branches/2.4.x/patches/backport-module-flags.diff
>> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/patches/backport-module-flags.diff?rev=1811930&view=auto
>> ==============================================================================
>> --- httpd/httpd/branches/2.4.x/patches/backport-module-flags.diff (added)
>> +++ httpd/httpd/branches/2.4.x/patches/backport-module-flags.diff Thu Oct 12 09:45:35 2017
>> @@ -0,0 +1,171 @@
>> +Index: include/ap_mmn.h
>> +===================================================================
>> +--- include/ap_mmn.h (revision 1811919)
>> ++++ include/ap_mmn.h (working copy)
>> +@@ -496,6 +496,8 @@
>> + * to ap_[r]getline()
>> + * 20120211.68 (2.4.26-dev) Add ap_get_basic_auth_components() and deprecate
>> + * ap_get_basic_auth_pw()
>> ++ * 20120211.69 (2.4.29-dev) Add flags field to module_struct and function
>> ++ * ap_get_module_flags()
>> + */
>> +
>> + #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
>> +@@ -503,7 +505,7 @@
>> + #ifndef MODULE_MAGIC_NUMBER_MAJOR
>> + #define MODULE_MAGIC_NUMBER_MAJOR 20120211
>> + #endif
>> +-#define MODULE_MAGIC_NUMBER_MINOR 68 /* 0...n */
>> ++#define MODULE_MAGIC_NUMBER_MINOR 69 /* 0...n */
>> +
>> + /**
>> + * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
>> +Index: include/http_config.h
>> +===================================================================
>> +--- include/http_config.h (revision 1811919)
>> ++++ include/http_config.h (working copy)
> []
>> +@@ -519,6 +528,21 @@
>> + AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
>> + void *val);
>> +
>> ++/**
>> ++ * When module flags have been introduced, and a way to check this.
>> ++ */
>> ++#define AP_MODULE_FLAGS_MMN_MAJOR 20161018
>> ++#define AP_MODULE_FLAGS_MMN_MINOR 7
>> ++#define AP_MODULE_HAS_FLAGS(m) \
>> ++ AP_MODULE_MAGIC_AT_LEAST(AP_MODULE_FLAGS_MMN_MAJOR, \
>> ++ AP_MODULE_FLAGS_MMN_MINOR)
>
> For 2.4.x, I think AP_MODULE_FLAGS_MMN_MAJOR and
> AP_MODULE_FLAGS_MMN_MINOR should be the ones (in 2.4.x) at the time of
> this backport, i.e. (per ap_mmn.h change above):
>
> +#define AP_MODULE_FLAGS_MMN_MAJOR 20120211
> +#define AP_MODULE_FLAGS_MMN_MINOR 69
>
>
> I'm still +1 for a "backport-module-flags-v2.diff" with this change ;)