From: Jean-Frederic Clere <jfclere@apache.org>
Date: Tue, 5 Mar 2024 10:23:37 +0000 (+0000)
Subject: remove my proposal and vote Joe's one.
X-Git-Tag: 2.4.59-rc1-candidate~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9ac6f2e19b465925f5287663a7a0bde1af4aba1;p=thirdparty%2Fapache%2Fhttpd.git

remove my proposal and vote Joe's one.


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

diff --git a/STATUS b/STATUS
index 8cd3e9a64f9..93b1beeca6d 100644
--- a/STATUS
+++ b/STATUS
@@ -211,7 +211,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    https://svn.apache.org/r1877693
       2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/408.patch
       Github PR: https://github.com/apache/httpd/pull/408
-      +1: jorton, ylavic,
+      +1: jorton, ylavic, jfclere
 
    *) htcacheclean: fix output for -A/-a mode
       trunk patch: https://svn.apache.org/r1915508
@@ -226,11 +226,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Github PR: https://github.com/apache/httpd/pull/410
       +1: jorton, ylavic,
 
-   *) htpasswd: Windows : do not include ap_config_auto.h 
-      trunk patch: https://svn.apache.org/r1877693 
-      2.4.x patch: svn merge -c 1877693 ^/httpd/httpd/trunk .
-      +1: jfclere, ylavic,
-
    *) mod_proxy: Don't reset the balancer when we create a new child
       and don't change shared memory mod_lbmethod_bytraffic is not using.
       trunk patch: https://svn.apache.org/r1916004