From: Jim Jagielski <jim@apache.org>
Date: Wed, 9 Jan 2013 12:26:34 +0000 (+0000)
Subject: these are in 2.4.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4239776ad8f495315347b9a4b3aabfa0db3ff93d;p=thirdparty%2Fapache%2Fhttpd.git

these are in 2.4.x


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

diff --git a/CHANGES b/CHANGES
index d3867f8c048..7160234a8b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,9 +24,6 @@ Changes with Apache 2.5.0
   *) mpm_event: Check that AsyncRequestWorkerFactor is not negative. PR 54254.
      [Jackie Zhang <jackie qq zhang gmail com>]
 
-  *) httxt2dbm: Correct length computation for the 'value' stored in the DBM file
-     PR 47650 [jon buckybox com]
-
   *) mod_ssl: Add support for OpenSSL configuration commands [Stephen Henson]
 
   *) EventOpt MPM
@@ -134,10 +131,6 @@ Changes with Apache 2.5.0
   *) mod_ssl: Add support for TLS Next Protocol Negotiation.  PR 52210.
      [Matthew Steele <mdsteele google.com>]
 
-  *) various modules, rotatelogs: Replace use of apr_file_write() with
-     apr_file_write_full() to prevent incomplete writes. PR 53131.
-     [Nicolas Viennot <apache viennot biz>, Stefan Fritsch]
-
   *) cross-compile: allow to provide CC_FOR_BUILD so that gen_test_char will
      be compiled by the build compiler instead of the host compiler.
      Also set CC_FOR_BUILD to 'cc' when cross-compilation is detected.