You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "stefan@eissing.org" <st...@eissing.org> on 2019/08/01 13:59:58 UTC
Re: svn commit: r1864153 - in /httpd/httpd/trunk/modules/md: mod_md.c
mod_md_os.c
Thanks. I'll port that back to 2.4.x right away.
> Am 01.08.2019 um 15:58 schrieb covener@apache.org:
>
> Author: covener
> Date: Thu Aug 1 13:58:45 2019
> New Revision: 1864153
>
> URL: http://svn.apache.org/viewvc?rev=1864153&view=rev
> Log:
> don't mess with AP_ENABLE_EXCEPTION_HOOK on trunk
>
> mpm_common defines it later anyway:
>
> In file included from mod_md.c:25:
> In file included from /Users/covener/SRC/httpd-trunk/include/mpm_common.h:40:
> In file included from /Users/covener/SRC/httpd-trunk/include/ap_config.h:184:
> /Users/covener/SRC/httpd-trunk/include/ap_config_auto.h:11:9: error: 'AP_ENABLE_EXCEPTION_HOOK' macro redefined [-Werror,-Wmacro-redefined]
>
>
> Modified:
> httpd/httpd/trunk/modules/md/mod_md.c
> httpd/httpd/trunk/modules/md/mod_md_os.c
>
> Modified: httpd/httpd/trunk/modules/md/mod_md.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/mod_md.c?rev=1864153&r1=1864152&r2=1864153&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/md/mod_md.c (original)
> +++ httpd/httpd/trunk/modules/md/mod_md.c Thu Aug 1 13:58:45 2019
> @@ -18,10 +18,6 @@
> #include <apr_optional.h>
> #include <apr_strings.h>
>
> -#include <ap_release.h>
> -#ifndef AP_ENABLE_EXCEPTION_HOOK
> -#define AP_ENABLE_EXCEPTION_HOOK 0
> -#endif
> #include <mpm_common.h>
> #include <httpd.h>
> #include <http_core.h>
>
> Modified: httpd/httpd/trunk/modules/md/mod_md_os.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/mod_md_os.c?rev=1864153&r1=1864152&r2=1864153&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/md/mod_md_os.c (original)
> +++ httpd/httpd/trunk/modules/md/mod_md_os.c Thu Aug 1 13:58:45 2019
> @@ -17,13 +17,6 @@
> #include <assert.h>
> #include <apr_strings.h>
>
> -#include <ap_mmn.h>
> -#if !AP_MODULE_MAGIC_AT_LEAST(20180720, 5)
> -#ifndef AP_ENABLE_EXCEPTION_HOOK
> -#define AP_ENABLE_EXCEPTION_HOOK 0
> -#endif
> -#endif
> -
> #include <mpm_common.h>
> #include <httpd.h>
> #include <http_log.h>
>
>