From: Bill Stoddard <stoddard@apache.org>
Date: Thu, 26 Aug 2004 00:55:51 +0000 (+0000)
Subject: backport
X-Git-Tag: STRIKER_2_1_0_RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bea93d121d6141089c27ae5849fe8f4c3928014;p=apache

backport


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

diff --git a/CHANGES b/CHANGES
index ec747f223b..3cf218b44d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -133,8 +133,6 @@ Changes with Apache 2.1.0-dev
      assigned if the origin server had set any cookies. PR 27023.
      [Jim Jagielski]
 
-  *) Prevent Win32 pool corruption at startup [Allan Edwards]
-
   *) Removed old and unmaintained ap_add_named_module API and changed
      the following APIs to return an error instead of hard exiting:
      ap_add_module, ap_add_loaded_module, ap_setup_prelinked_modules,
@@ -422,6 +420,8 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.51
 
+  *) Prevent Win32 pool corruption at startup [Allan Edwards]
+
   *) mod_ssl: Add "SSLUserName" directive to set r->user based on a
      chosen SSL environment variable.  PR 20957. 
      [Martin v. Loewis <martin v.loewis.de>]