From: Thom May <thommay@apache.org>
Date: Mon, 29 Sep 2003 12:12:19 +0000 (+0000)
Subject: Backport done.
X-Git-Tag: pre_ajp_proxy~1134
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9313ad5d8548d5cb03d7d0c7a3f400520c15c840;p=apache

Backport done.


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

diff --git a/CHANGES b/CHANGES
index b73e80e4d5..43394cbe91 100644
--- a/CHANGES
+++ b/CHANGES
@@ -105,11 +105,6 @@ Changes with Apache 2.1.0-dev
   *) Add support for IMT minor-type wildcards (e.g., text/*) to
      ExpiresByType.  PR#7991  [Ken Coar]
 
-  *) Ensure that ssl-std.conf is generated at configure time, and switch
-     to using the expanded config variables to work the same as
-     httpd-std.conf PR 19611
-     [Thom May]
-
   *) Fix a problem with namespace mappings being dropped in mod_dav_fs; 
      if any property values were set which defined namespaces these 
      came out mangled in the PROPFIND response.  PR 11637.
@@ -225,6 +220,11 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) Ensure that ssl-std.conf is generated at configure time, and switch
+     to using the expanded config variables to work the same as
+     httpd-std.conf PR 19611
+     [Thom May]
+
   *) mod_ssl: Fix segfaults after renegotiation failure. PR 21370
      [Hartmut Keil <Hartmut.Keil@adnovum.ch>]