From: Jeff Trawick <trawick@apache.org>
Date: Tue, 16 Mar 2004 21:11:17 +0000 (+0000)
Subject: sync with 2.0.49-dev
X-Git-Tag: pre_ajp_proxy~511
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=678376c6a4a8ef0e8ff1c10d6e899bb6ccd07b3c;p=apache

sync with 2.0.49-dev


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

diff --git a/CHANGES b/CHANGES
index b3b7caf631..de347e38bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) mod_cgid: Fix storage corruption caused by use of incorrect pool.
-     [Jeff Trawick]
-
   *) Satisfy directives now can be influenced by a surrounding <Limit>
      container.  PR 14726.  [André Malo]
 
@@ -283,6 +280,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_cgid: Fix storage corruption caused by use of incorrect pool.
+     [Jeff Trawick]
+
   *) Win32: find_read_listeners was not correctly handling multiple
      listeners on the Win32DisableAcceptEx path.  [Bill Stoddard]