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 19f4f148d891ff087dbeaa318080534816038908..5d8a7678cb88ea34b19effb8fa2db7a0fbc0d51a 100644 (file)
--- 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>]