Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1678699 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
 modules/filters/mod_deflate.c
Date: Mon, 11 May 2015 09:15:20 -0000
To: cvs@httpd.apache.org
From: ylavic@apache.org
Message-Id: <20150511091520.BBCE6AC09F8@hades.apache.org>

Author: ylavic
Date: Mon May 11 09:15:20 2015
New Revision: 1678699

URL: http://svn.apache.org/r1678699
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1678699&r1=1678698&r2=1678699&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon May 11 09:15:20 2015
@@ -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
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1678699&r1=1678698&r2=1678699&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon May 11 09:15:20 2015
@@ -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     

Modified: httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c?rev=1678699&r1=1678698&r2=1678699&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/mod_deflate.c Mon May 11 09:15:20 2015
@@ -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";