From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 3 Jun 2014 15:06:45 +0000 (+0000)
Subject: Remove backported changes.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44e8bab801221b2cd1cbb51c3d6671943432ed70;p=thirdparty%2Fapache%2Fhttpd.git

Remove backported changes.

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

diff --git a/CHANGES b/CHANGES
index ab3be90a9dc..d3f7399ebd5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,9 +25,6 @@ Changes with Apache 2.5.0
   *) mod_proxy_balancer: Correctly encode user provided data in management
      interface. PR 56532 [Maksymilian, <max cert.cx>]
 
-  *) mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:"
-     scheme. PR55320. [Alex Liu <alex.leo.ca gmail.com>]
-
   *) core: Add ap_mpm_resume_suspended() API to allow a suspended connection
      to resume. PR56333 
      [Artem <artemciy gmail.com>, Edward Lu <Chaosed0 gmail.com>]
@@ -48,10 +45,6 @@ Changes with Apache 2.5.0
   *) mod_cache: Don't add cached/revalidated entity headers to a 304 response.
      PR 55547. [Yann Ylavic]
 
-  *) mod_cache: Retry unconditional request with the full URL (including the
-     query-string) when the origin server's 304 response does not match the
-     conditions used to revalidate the stale entry.  [Yann Ylavic].
-
   *) mod_authnz_ldap: Fail explicitly when the filter is too long. Remove
      unnecessary apr_pstrdup() and strlen(). [Graham Leggett]
 
@@ -95,14 +88,6 @@ Changes with Apache 2.5.0
   *) mod_proxy_wstunnel: Stop leaking websockets backend connections under
      event MPM (trunk-only). [Eric Covener]
 
-  *) mod_proxy_wstunnel: Don't issue AH02447 and log a 500 on routine 
-     hangups from websockets origin servers. PR 56299
-     [Yann Ylavic, Edward Lu <Chaosed0 gmail com>, Eric Covener] 
-
-  *) mod_proxy_wstunnel: Don't pool backend websockets connections,
-     because we need to handshake every time. PR 55890.
-     [Eric Covener]
-
   *) mod_proxy_http: Add detach_backend hook (potentially usable
      in other proxy scheme handlers).  [Jeff Trawick]