protect 'AP_DECLARE_MODULE(deflate)' from expansion to

'AP_DECLARE_MODULE(z_deflate)' if zlib has been built with
-DZ_PREFIX.

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

diff --git a/CHANGES b/CHANGES
index 76f4577ab288db6bf441bc898ccc9289cbee8825..1ad375b30fd9793860e0288849a0a467c6e7eb9e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_deflate: permit compilation of mod_deflate against a zlib that has
+     been configured with -D Z_PREFIX, which redefines the token "deflate".
+     [Eric Covener]
+
   *) mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
      previously limited to 64MB. [Jens Låås <jelaas gmail.com>]
 

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 79f6f8d1caf7881955b67b2a7a8a7bb76f7dc825..34de1d03d3d9655cd397b8ee46643dfc749d453c 100644 (file)
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -1551,6 +1551,10 @@ static const command_rec deflate_filter_cmds[] = {
     {NULL}
 };
 
+/* zlib can be built with #define deflate z_deflate */
+#ifdef deflate
+#undef deflate
+#endif
 AP_DECLARE_MODULE(deflate) = {
     STANDARD20_MODULE_STUFF,
     NULL,                         /* dir config creater */