From: Stefan Fritsch <sf@apache.org>
Date: Sun, 9 Dec 2012 21:50:13 +0000 (+0000)
Subject: remove two more items that have been backported to 2.4
X-Git-Tag: 2.5.0-alpha~6039
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=503179967408b4af81b9fcf946e03bf7798f63f5;p=thirdparty%2Fapache%2Fhttpd.git

remove two more items that have been backported to 2.4


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

diff --git a/CHANGES b/CHANGES
index 055959f3300..11ed9c6c066 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,9 +40,6 @@ Changes with Apache 2.5.0
      Windows ("...rename tempfile to datafile failed..."). PR 38827
      [Eric Covener]
 
-  *) mod_proxy: Add ability to configure the sticky session separator.
-     PR 53893. [<inu inusasha de>, Jim Jagielski]
-
   *) mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records.
      PR 40841. [Andrew Rucker Jones <arjones simultan dyndns org>,
      <ast domdv de>, Jim Jagielski]
@@ -64,10 +61,6 @@ Changes with Apache 2.5.0
      error handling. Add some of htpasswd's improvements to htdbm,
      e.g. warn if password is truncated by crypt(). [Stefan Fritsch]
 
-  *) ab: add TLS1.1/TLS1.2 options to -f switch, and adapt output
-     to more accurately report the negotiated protocol. PR 53916.
-     [Nicolás Pernas Maradei <nico emutex com>, Kaspar Brand]
-
   *) mod_systemd: New module, for integration with systemd on Linux.
      [Jan Kaluza <jkaluza redhat.com>]