From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 11 Mar 2003 06:39:26 +0000 (+0000)
Subject:   Move an accepted backport.  BTW - what's with the *new* mismatches
X-Git-Tag: pre_ajp_proxy~2006
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdb91812fc87d28e5ab52574a52577c8deaadd21;p=apache

  Move an accepted backport.  BTW - what's with the *new* mismatches
  between CHANGES in 2.0-stable and 2.1-dev under the (2.0.45) section?


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

diff --git a/CHANGES b/CHANGES
index 75564a1c63..db2151c37f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -68,11 +68,6 @@ Changes with Apache 2.1.0-dev
   *) Keep the subrequest filter in place when a subrequest is 
      redirected.  PR 15423.  [Jeff Trawick]
 
-  *) Allow SSLMutex to select/use the full range of APR locking
-     mechanisms available to it. Also, fix the bug that SSLMutex uses
-     APR_LOCK_DEFAULT no matter what.  PR 8122  [Jim Jagielski,
-     martin.t.kutschker@blackbox.net (Martin Kutschker)]
-
   *) Return 413 if chunk-ext-header is too long rather than reading from
      the truncated line.  PR 15857.  [Justin Erenkrantz]
 
@@ -169,6 +164,11 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.45
 
+  *) Allow SSLMutex to select/use the full range of APR locking
+     mechanisms available to it. Also, fix the bug that SSLMutex uses
+     APR_LOCK_DEFAULT no matter what.  PR 8122  [Jim Jagielski,
+     martin.t.kutschker@blackbox.net (Martin Kutschker)]
+
   *) Restore the ability of htdigest.exe to create files that contain
      more than one user. PR 12910.  [André Malo]