From: Joe Orton <jorton@apache.org>
Date: Wed, 31 Jan 2024 15:42:06 +0000 (+0000)
Subject: Merged x1.
X-Git-Tag: 2.4.59-rc1-candidate~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b747009d9333590b72394dd01e519a3b514f40fb;p=thirdparty%2Fapache%2Fhttpd.git

Merged x1.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1915497 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 78851c71ddd..97afb7c4b46 100644
--- a/STATUS
+++ b/STATUS
@@ -220,12 +220,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-add-CGIScriptTimeout.patch
       +1: minfrin, ylavic
 
-   *) core: Allow mod_env to override all system path environment variables,
-      not just PATH.
-      trunk patch: http://svn.apache.org/r1811831
-      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-mod_env-override.patch
-      +1: minfrin, ylavic, jorton
-
    *) mod_ldap: Add a hint to install the apr_ldap module on init failure.
       trunk patch: http://svn.apache.org/r1914038
       2.4.x patch: svn merge -c r1914038 ^/httpd/httpd/trunk .