From: Yann Ylavic <ylavic@apache.org>
Date: Sat, 18 Nov 2023 13:55:45 +0000 (+0000)
Subject: Update proposal, vote/comment.
X-Git-Tag: 2.4.59-rc1-candidate~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f2c3cf07c12152a850840e590422176c08517c6;p=thirdparty%2Fapache%2Fhttpd.git

Update proposal, vote/comment.

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

diff --git a/STATUS b/STATUS
index a00999b2a50..93e40ebdb47 100644
--- a/STATUS
+++ b/STATUS
@@ -176,18 +176,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        https://svn.apache.org/r1912245
         svn merge -c 1912245 ^/httpd/httpd/trunk .
      +1: jfclere, minfrin
+     ylavic: +1 with r1913930, we can't provide exported functions w/o an
+             ap_[proxy_] prefix.
 
   *) mod_ssl: fix LibreSSL build
      Trunk version of patch:
        https://svn.apache.org/r1874101
-        svn merge -c 1874101 ^/httpd/httpd/trunk .
-     +1: gbechis, ylavic
-     ylavic: changes in ssl_private.h not needed if/after r1908537 is
-             backported (below proposal), though they are harmless. See:
-             https://lists.apache.org/thread/k924ql8c9ry1b9y94fpr2b0d5o6tmds6
-             I'd suggest adding r1913838 here if both proposals can be merged
-             at the same time..
+       https://svn.apache.org/r1913838
+       svn merge -c 1874101,1913838 ^/httpd/httpd/trunk .
+     +1: ylavic
      minfrin: r1908537 is backported, can you update this proposal clean?
+     ylavic: done, votes reset
 
    *) mod_ldap: HTML-escape data in ldap-status handler
       trunk patch: http://svn.apache.org/r1913855