From a4a3b5366969254d0c9950cc21990db284fda35a Mon Sep 17 00:00:00 2001
From: Rainer Jung <rjung@apache.org>
Date: Tue, 11 Dec 2012 11:06:09 +0000
Subject: [PATCH] - Remove backported items from CHANGES. - Add eventopt to
 CHANGES - Remove obsolete compatibility note form SRP docs   (has been
 backported).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420094 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES                     | 21 ++-------------------
 docs/manual/mod/mod_ssl.xml |  4 ----
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8a127252dc..4770e6fa02 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) EventOpt MPM
+
   *) mod_proxy_balancer: Improve output
      PR 52478 [Danijel <dt-ng rbfh de>]
   
@@ -53,17 +55,6 @@ Changes with Apache 2.5.0
   *) configure: Fix processing of --disable-FEATURE for various features.
      [Jeff Trawick]
 
-  *) htpasswd, htdbm: Optionally read passwords from stdin, as more
-     secure alternative to -b.  PR 40243. [Adomas Paltanavicius <adomas
-     paltanavicius gmail com>, Stefan Fritsch]
-
-  *) htpasswd, htdbm: Add support for bcrypt algorithm (requires
-     apr-util 1.5 or higher). PR 49288. [Stefan Fritsch]
-
-  *) htpasswd, htdbm: Put full 48bit of entropy into salt, improve
-     error handling. Add some of htpasswd's improvements to htdbm,
-     e.g. warn if password is truncated by crypt(). [Stefan Fritsch]
-
   *) mod_systemd: New module, for integration with systemd on Linux.
      [Jan Kaluza <jkaluza redhat.com>]
 
@@ -74,10 +65,6 @@ Changes with Apache 2.5.0
      that replaces mod_mem_cache removed from httpd v2.2. [Graham
      Leggett]
 
-  *) mod_auth_form: Support the expr parser in the
-     AuthFormLoginRequiredLocation, AuthFormLoginSuccessLocation and
-     AuthFormLogoutLocation directives. [Graham Leggett]
-
   *) core: Add dirwalk_stat and pre_htaccess hooks, allowing mpm-itk
      to be used without patches to httpd core.  [Jeff Trawick]
 
@@ -133,10 +120,6 @@ Changes with Apache 2.5.0
 
   *) mod_ssl: Add RFC 5878 support. [Ben Laurie]
 
-  *) mod_ssl: Add support for TLS-SRP (Secure Remote Password key exchange
-     for TLS, RFC 5054). PR 51075. [Quinn Slack <sqs cs stanford edu>,
-     Christophe Renou, Peter Sylvester]
-
   *) suexec: Add --enable-suexec-capabilites support on Linux, to use
      setuid/setgid capability bits rather than a setuid root binary.
      [Joe Orton]
diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index e4d18aca91..f4f036f4c9 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1189,8 +1189,6 @@ SSLVerifyDepth 10
 <syntax>SSLSRPVerifierFile <em>file-path</em></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.5.0 and later, if using OpenSSL 1.0.1 or
-later</compatibility>
 
 <usage>
 <p>
@@ -1218,8 +1216,6 @@ avalable in the <code>SSL_SRP_USERINFO</code> request environment variable.</p>
 <syntax>SSLSRPUnknownUserSeed <em>secret-string</em></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.5.0 and later, if using OpenSSL 1.0.1 or
-later</compatibility>
 
 <usage>
 <p>
-- 
2.50.1