From: Ruediger Pluem <rpluem@apache.org>
Date: Fri, 16 Jun 2023 11:01:03 +0000 (+0000)
Subject: * Add comment [skip ci]
X-Git-Tag: 2.4.58-rc1-candidate~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=618e81cffa8a1f2c058cab86b9e1883612da31ca;p=thirdparty%2Fapache%2Fhttpd.git

* Add comment [skip ci]

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

diff --git a/STATUS b/STATUS
index 2c690de512f..70e0a8b8cc7 100644
--- a/STATUS
+++ b/STATUS
@@ -249,6 +249,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Backport version for 2.4.x of patch:
         svn merge -c 1910157 ^/httpd/httpd/trunk .
      +1: icing
+     rpluem says: This one has conflicts in modules/http2/h2_request.c and
+     modules/http2/h2_version.h.
 
   *) Easy patches: synch 2.4.x and trunk
          - core: constify pointers in ap_expr lookup tables.  ~1/2Kb moves to r/o text section