From: Stefan Fritsch Date: Sun, 9 Dec 2012 20:52:04 +0000 (+0000) Subject: Remove some backported items X-Git-Tag: 2.5.0-alpha~6040 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24b572a268848c0c4d7b511b1c21430c1df611e7;p=apache Remove some backported items git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1419157 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index b3950e3c97..055959f330 100644 --- a/CHANGES +++ b/CHANGES @@ -16,10 +16,6 @@ Changes with Apache 2.5.0 *) ap_expr: Add SERVER_PROTOCOL_VERSION, ..._MAJOR, and ..._MINOR variables. [Stefan Fritsch] - *) mod_rewrite: Stop mergeing RewriteBase down to subdirectories - unless new option 'RewriteOptions MergeBase' is configured. - PR 53963. [Eric Covener] - *) core: New directive RegisterHttpMethod for registering non-standard HTTP methods. [Stefan Fritsch] @@ -78,13 +74,6 @@ Changes with Apache 2.5.0 *) --with-module: Fix failure to integrate them into some existing module directories. PR 40097. [Jeff Trawick] - *) mod_headers: New params: %l for load averages, %i for an - idle percentage rating of httpd, and %b for a busy percentage - rating. [Jim Jagielski] - - *) core: New functions to obtain load parameters: ap_get_sload() - and ap_get_loadavg(). [Jim Jagielski] - *) mod_cache_socache: New cache implementation backed by mod_socache that replaces mod_mem_cache removed from httpd v2.2. [Graham Leggett] @@ -152,10 +141,6 @@ Changes with Apache 2.5.0 for TLS, RFC 5054). PR 51075. [Quinn Slack , Christophe Renou, Peter Sylvester] - *) core: Make ap_regcomp() return AP_REG_ESPACE if out of memory. Make - ap_pregcomp() abort if out of memory. This raises the minimum PCRE - requirement to version 6.0. PR 53284. [Stefan Fritsch] - *) suexec: Add --enable-suexec-capabilites support on Linux, to use setuid/setgid capability bits rather than a setuid root binary. [Joe Orton]