zap recent backports

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

diff --git a/CHANGES b/CHANGES
index ad2dbdbac2f15d93b3e3abb8812726c602a7d6e2..5c7bd9cb7a172a06e118fda278bf214552bc59c2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -25,26 +25,10 @@ Changes with Apache 2.5.0
      checks, loads and saves the request.
      PR 60577.  [Yann Ylavic]
   
-  *) mod_proxy_fcgi: Add ProxyFCGISetEnvIf to fixup CGI environment
-     variables just before invoking the FastCGI. [Eric Covener,
-     Jacob Champion]
-
-  *) mod_proxy: Allow the per-request environment variable "no-proxy" to
-     be used as an alternative to ProxyPass /path !. This is primarily
-     to set exceptions for ProxyPass specified in <Location> context.
-     Use SetEnvIf, not SetEnv. [Eric Covener]
-
-  *) mod_ssl: work around leaks on (graceful) restart. [Yann Ylavic]
-
   *) When using mod_status with the Event MPM, report the number of requests
      associated with an active connection in the "ACC" field. Previously
      zero was always reported with this MPM.  PR60647. [Eric Covener]
 
-  *) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the
-     URI originally requsted by the user, not the nested documents URI. This
-     restores the behavior of this variable to match the "legacy" SSI parser.
-     PR60624. [Hank Ibell <hwibell gmail.com>]
-
   *) mod_proxy_hcheck: Don't validate timed out responses.  [Yann Ylavic]
 
   *) mod_proxy_hcheck: Ensure thread-safety when concurrent healthchecks are
@@ -148,8 +132,6 @@ Changes with Apache 2.5.0
   *) core: Added support for HTTP code 451. PR58985.
      [Yehuda Katz <yehuda ymkatz.net>, Jim Jagielski]
 
-  *) mod_ssl: Add support for OpenSSL 1.1.0. [Rainer Jung]
-
   *) mod_filter: Fix AddOutputFilterByType with non-content-level filters.
      PR58856 [Micha Lenk <micha lenk.info>]