Return-Path: 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 235DF9B51 for ; Sat, 4 Aug 2012 21:32:16 +0000 (UTC) Received: (qmail 16660 invoked by uid 500); 4 Aug 2012 21:32:16 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 16612 invoked by uid 500); 4 Aug 2012 21:32:16 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 16605 invoked by uid 99); 4 Aug 2012 21:32:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Aug 2012 21:32:15 +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; Sat, 04 Aug 2012 21:32:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D931723888E4; Sat, 4 Aug 2012 21:31:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1369474 - /httpd/httpd/trunk/CHANGES Date: Sat, 04 Aug 2012 21:31:29 -0000 To: cvs@httpd.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120804213129.D931723888E4@eris.apache.org> Author: rjung Date: Sat Aug 4 21:31:29 2012 New Revision: 1369474 URL: http://svn.apache.org/viewvc?rev=1369474&view=rev Log: Remove backported items from trunk CHANGES. Modified: httpd/httpd/trunk/CHANGES Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1369474&r1=1369473&r2=1369474&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Sat Aug 4 21:31:29 2012 @@ -17,10 +17,6 @@ Changes with Apache 2.5.0 *) mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/ DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file. [Jeff Trawick] - *) mpm_event: Don't count connections in lingering close state when - calculating how many additional connections may be accepted. - [Stefan Fritsch] - *) mod_ssl: Add RFC 5878 support. [Ben Laurie] *) mod_lua: Add new directive LuaAuthzProvider to allow implementing an @@ -32,10 +28,6 @@ Changes with Apache 2.5.0 *) mod_lua: Change prototype of vm_construct, to work around gcc bug which causes a segfault. PR 52779. [Dick Snippe ] - *) mod_ssl: If exiting during initialization because of a fatal error, - log a message to the main error log pointing to the appropriate - virtual host error log. [Stefan Fritsch] - *) mod_ssl: Add support for TLS-SRP (Secure Remote Password key exchange for TLS, RFC 5054). PR 51075. [Quinn Slack , Christophe Renou, Peter Sylvester]