Return-Path: 
 <cvs-return-45686-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DEF74D66E
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Tue, 11 Dec 2012 11:06:38 +0000 (UTC)
Received: (qmail 59105 invoked by uid 500); 11 Dec 2012 11:06:38 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 58982 invoked by uid 500); 11 Dec 2012 11:06:38 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 58955 invoked by uid 99); 11 Dec 2012 11:06:37 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Dec 2012 11:06:37 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Dec 2012 11:06:34 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id F1817238890B;
	Tue, 11 Dec 2012 11:06:12 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1420094 - in /httpd/httpd/trunk: CHANGES
 docs/manual/mod/mod_ssl.xml
Date: Tue, 11 Dec 2012 11:06:11 -0000
To: cvs@httpd.apache.org
From: rjung@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121211110612.F1817238890B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rjung
Date: Tue Dec 11 11:06:09 2012
New Revision: 1420094

URL: http://svn.apache.org/viewvc?rev=1420094&view=rev
Log:
- Remove backported items from CHANGES.
- Add eventopt to CHANGES
- Remove obsolete compatibility note form SRP docs
  (has been backported).

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1420094&r1=1420093&r2=1420094&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Dec 11 11:06:09 2012
@@ -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]

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml?rev=1420094&r1=1420093&r2=1420094&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl.xml Tue Dec 11 11:06:09 2012
@@ -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</
 <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>