mod_deflate: Define APR_INT32_MAX when it is missing so to be able to

compile against APR-1.2.x (minimum required version).

Committed by: ylavic
Reviewed by: ylavic, trawick, gsmith

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1678699 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 5bae083038f328ffdf2652c261ee3abf7a874ae8..b6afe5920a01378e314aae6288a666c581b6f87c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.30
 
-
+  *) mod_deflate: Define APR_INT32_MAX when it is missing so to be able to
+     compile against APR-1.2.x (minimum required version). [Yann Ylavic]
 
 Changes with Apache 2.2.29
 

diff --git a/STATUS b/STATUS
index fbce6c34cb4900188af45316f22e73dc4b25fe51..e2442cb01f30d5ef62d15aac74c093b80833997a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -101,12 +101,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_deflate: Define APR_INT32_MAX when it is missing so to be able to
-                  compile against APR-1.2.x (minimum required version).
-     trunk/2.4.x patch: not concerned (require APR-1.5.x)
-     2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_deflate_APR_INT32_MAX.patch
-     +1: ylavic, trawick, gsmith
-
    * default conf: Disable SSLv3, like SSLv2, in the default configuration.
      trunk patch: n/a -- Only 2.2.x has SSLProtocol in httpd-ssl.conf.in
      2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=32131     

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index de3387d6aa3f5425f7576c7fcada911a93f74948..3131805eb1b5df45bed2eabf1f85a5107038b380 100644 (file)
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -47,6 +47,10 @@
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
+#ifndef APR_INT32_MAX
+#define APR_INT32_MAX 0x7fffffff
+#endif
+
 #include "zlib.h"
 
 static const char deflateFilterName[] = "DEFLATE";