From: Thom May <thommay@apache.org>
Date: Mon, 29 Sep 2003 12:12:15 +0000 (+0000)
Subject: Backport done
X-Git-Tag: 2.0.48~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89d233d88f330604b381123f49265d5c82ce469b;p=thirdparty%2Fapache%2Fhttpd.git

Backport done


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

diff --git a/CHANGES b/CHANGES
index 19f4f148d89..5d8a7678cb8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 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: 1961
+     [Thom May]
+
   *) mod_ssl: Fix segfaults after renegotiation failure. PR 21370
      [Hartmut Keil <Hartmut.Keil@adnovum.ch>]