From: Graham Leggett <minfrin@apache.org>
Date: Tue, 25 May 2004 16:47:18 +0000 (+0000)
Subject: Backport
X-Git-Tag: pre_ajp_proxy~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3a1bc89bd54ef79abdc975294fc6909c0555425;p=apache

Backport
PR:
Obtained from:
Submitted by:
Reviewed by:


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

diff --git a/CHANGES b/CHANGES
index ff44919f20..953f6c5d1d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,10 +5,6 @@ Changes with Apache 2.1.0-dev
   *) Allow LimitRequestBody to be reset to unlimited. PR 29106
      [André Malo]
 
-  *) Fix a segfault when requests for shared memory fails and returns
-     NULL. Fix a segfault caused by a lack of bounds checking on the
-     cache. PR 24801 [Graham Leggett]
-
   *) Small fix to allow reverse proxying to an ftp server. Previously
      an attempt to do this would try and connect to 0.0.0.0, regardless
      of the server specified. PR 24922
@@ -384,6 +380,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) Fix a segfault when requests for shared memory fails and returns
+     NULL. Fix a segfault caused by a lack of bounds checking on the
+     cache. PR 24801 [Graham Leggett]
+
   *) Throw an error message if an attempt is made to use the LDAPTrustedCA
      or LDAPTrustedCAType directives in a VirtualHost. PR 26390
      [Brad Nicholes]