From: Yann Ylavic <ylavic@apache.org>
Date: Sat, 18 Nov 2023 13:59:56 +0000 (+0000)
Subject: Keep my initial comment for better understanding.
X-Git-Tag: 2.4.59-rc1-candidate~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b25d76ffe364d950d6e8e28caa3a7804c80ea03;p=thirdparty%2Fapache%2Fhttpd.git

Keep my initial comment for better understanding.

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

diff --git a/STATUS b/STATUS
index 93e40ebdb47..aa741a5da5d 100644
--- a/STATUS
+++ b/STATUS
@@ -185,6 +185,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        https://svn.apache.org/r1913838
        svn merge -c 1874101,1913838 ^/httpd/httpd/trunk .
      +1: 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..
      minfrin: r1908537 is backported, can you update this proposal clean?
      ylavic: done, votes reset