From: Jeff Trawick <trawick@apache.org>
Date: Tue, 16 Sep 2003 13:39:19 +0000 (+0000)
Subject: sync with APACHE_2_0_BRANCH
X-Git-Tag: pre_ajp_proxy~1161
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=caa5b3291b5d47a0ac5fdcd7433da3e2a142e0fd;p=apache

sync with APACHE_2_0_BRANCH


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

diff --git a/CHANGES b/CHANGES
index e66750c471..118687ea58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -99,9 +99,6 @@ Changes with Apache 2.1.0-dev
      committed fix for PR 13946 (in mod_rewrite). Reported by
      Andre Malo. [Paul J. Reder]
 
-  *) mod_ssl: Fix a problem setting variables that represent the
-     client certificate chain.  PR 21397  [Jeff Trawick]
-
   *) mod_rewrite: fix a problem in the proxy support of mod_rewrite.
      The broken code was inserting multiple "proxy:" fields in the
      rewritten URIs. [PR: 13946]
@@ -255,6 +252,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) mod_ssl: Fix a problem setting variables that represent the
+     client certificate chain.  PR 21371  [Jeff Trawick]
+
   *) Unix: Handle permissions settings for flock-based mutexes in 
      unixd_set_global|proc_mutex_perms().  Allow the functions to be
      called for any type of mutex.  PR 20312  [Jeff Trawick]