]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
added 1923806 to scoreboard backport
authorStefan Eissing <icing@apache.org>
Fri, 14 Feb 2025 10:06:52 +0000 (10:06 +0000)
committerStefan Eissing <icing@apache.org>
Fri, 14 Feb 2025 10:06:52 +0000 (10:06 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923807 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 5eb805042059fbd957153238f4ae7ce2f2377637..ffefdcc5573984b0595fb96b2ad9a50b43c4e1a5 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -190,8 +190,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) scoreboard/mod_http2: record durations of HTTP/2 requests.
      Trunk version of patch:
         https://svn.apache.org/r1923754
+        https://svn.apache.org/r1923806
      Backport version for 2.4.x of patch:
-        svn merge -c 1923754 ^/httpd/httpd/trunk .
+        svn merge -c 1923754,1923806 ^/httpd/httpd/trunk .
      backport needs adjusting MMN
      +1: icing