Backported

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/CHANGES b/CHANGES
index 4be82e500e1750a1180975547c1c4c9909b3fd77..ff44919f203fde2a35dfa8f513ace1e31ba78629 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,10 +9,6 @@ Changes with Apache 2.1.0-dev
      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]
-
   *) 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
@@ -388,6 +384,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) Throw an error message if an attempt is made to use the LDAPTrustedCA
+     or LDAPTrustedCAType directives in a VirtualHost. PR 26390
+     [Brad Nicholes]
+
   *) Fix a potential segfault if the bind password in the LDAP cache
      is NULL. PR 26686 [Jari Ahonen <jah@progress.com>]