From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 11 May 2015 09:15:20 +0000 (+0000)
Subject: mod_deflate: Define APR_INT32_MAX when it is missing so to be able to
X-Git-Tag: 2.2.30~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e879fe5d589e509cbdc5a6bc3ff32208e38f071;p=thirdparty%2Fapache%2Fhttpd.git

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 5bae083038f..b6afe5920a0 100644
--- 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 fbce6c34cb4..e2442cb01f3 100644
--- 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 de3387d6aa3..3131805eb1b 100644
--- 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";