From: Martin Kraemer <martin@apache.org>
Date: Tue, 20 Sep 2005 15:15:34 +0000 (+0000)
Subject: Backported to 2.2.x branch -- is 2.1.8 identical to 'the 2.2.x branch'?
X-Git-Tag: 2.3.0~2981
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=526eb48cfedb44c6827a9460d8fb81105d73e9e1;p=thirdparty%2Fapache%2Fhttpd.git

Backported to 2.2.x branch -- is 2.1.8 identical to 'the 2.2.x branch'?

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

diff --git a/CHANGES b/CHANGES
index a08aaa2d608..01f25b9d7c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) Fix PR 25659 - Memory leak in ssl_util_algotypeof()
-     [David Blake <dblake hp com>, Martin Kraemer]
-
   *) Fix mod_dbd's config [Brian J. France <list firehawksystems.com>]
 
   *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
@@ -30,6 +27,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.8
 
+  *) Fix PR 25659 - Memory leak in ssl_util_algotypeof()
+     [David Blake <dblake hp com>, Martin Kraemer]
+
   *) Document the ReceiveBufferSize change done in r157583 [Murray
      Nesbitt <murray@cpan.org>]