From: Jeff Trawick <trawick@apache.org>
Date: Mon, 19 Aug 2013 11:41:29 +0000 (+0000)
Subject: merged to 2.4.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fa52ae64a4b152269bff8eec9d089392c4c1fb2;p=thirdparty%2Fapache%2Fhttpd.git

merged to 2.4.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1515371 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 43a9fd02620..592f0a5ab38 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,10 +12,6 @@ Changes with Apache 2.5.0
   *) core: Add ap_log_data(), ap_log_rdata(), etc. for logging buffers.
      [Jeff Trawick]
 
-  *) ab: Fix potential buffer overflows when processing the T and X
-     command-line options.  PR 55360.
-     [Mike Rumph <mike.rumph oracle.com>]
-
   *) mod_unique_id: Use output of the PRNG rather than IP address and
      pid, avoiding sleep() call and possible DNS issues at startup,
      plus improving randomness for IPv6-only hosts.