From: Jeff Trawick <trawick@apache.org>
Date: Thu, 27 Jun 2013 16:48:13 +0000 (+0000)
Subject: add CHANGES entries for r1497429
X-Git-Tag: 2.2.25~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad6f0c0fdbc66f2f857817a776c8765841cc7b52;p=thirdparty%2Fapache%2Fhttpd.git

add CHANGES entries for r1497429

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

diff --git a/CHANGES b/CHANGES
index 75363d6d866..c746c1d306b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,13 @@ Changes with Apache 2.2.25
      escaped to prevent terminal escape sequences from entering the
      log file.  [Eric Covener, Jeff Trawick, Joe Orton]
 
+  *) core: Limit ap_pregsub() to 64MB and add ap_pregsub_ex() for longer
+     strings.  The default limit for ap_pregsub() can be adjusted at compile
+      time by defining AP_PREGSUB_MAXLEN.  [Stefan Fritsch, Jeff Trawick]
+
+  *) mod_setenvif: Log error on substitution overflow.
+     [Stefan Fritsch]
+
   *) mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits
      in the error log to debug level.  [William Rowe]