From: Eric Covener <covener@apache.org>
Date: Sun, 23 Jun 2013 14:56:27 +0000 (+0000)
Subject: protect 'AP_DECLARE_MODULE(deflate)' from expansion to
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d16475b93209a94b6ac636b847692b6b3e5ca66e;p=thirdparty%2Fapache%2Fhttpd.git

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 76f4577ab28..1ad375b30fd 100644
--- 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 79f6f8d1caf..34de1d03d3d 100644
--- 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 */