From: Graham Leggett <minfrin@apache.org>
Date: Mon, 20 Nov 2023 13:14:21 +0000 (+0000)
Subject: Promote.
X-Git-Tag: 2.4.59-rc1-candidate~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89559f5a2065ced38fdb4346f43fc9feb79cd30b;p=thirdparty%2Fapache%2Fhttpd.git

Promote.


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

diff --git a/STATUS b/STATUS
index f83c4d3a316..b872224c608 100644
--- a/STATUS
+++ b/STATUS
@@ -153,6 +153,18 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) Allow mod_dav_fs to tolerate race conditions between PROPFIND and an
+      operation which removes a directory/file between apr_dir_read() and
+      apr_stat(). Current behaviour is to abort the connection which seems
+      inferior to tolerating (and logging) the error.
+      trunk patch: http://svn.apache.org/r1910811
+      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-tolerant.patch
+      +1: minfrin, ylavic, jorton
+
+   *) core: Fix use after free warning with gcc -fanalyzer.
+      trunk patch: http://svn.apache.org/r1892413
+      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-use-after-free.patch
+      +1: minfrin, ylavic, jorton
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -218,25 +230,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-add-CGIScriptTimeout.patch
       +1: minfrin, ylavic
 
-   *) Allow mod_dav_fs to tolerate race conditions between PROPFIND and an
-      operation which removes a directory/file between apr_dir_read() and
-      apr_stat(). Current behaviour is to abort the connection which seems
-      inferior to tolerating (and logging) the error.
-      trunk patch: http://svn.apache.org/r1910811
-      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-tolerant.patch
-      +1: minfrin, ylavic, jorton
-
    *) core: Allow mod_env to override all system path environment variables,
       not just PATH.
       trunk patch: http://svn.apache.org/r1811831
       2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-mod_env-override.patch
       +1: minfrin, ylavic
 
-   *) core: Fix use after free warning with gcc -fanalyzer.
-      trunk patch: http://svn.apache.org/r1892413
-      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-use-after-free.patch
-      +1: minfrin, ylavic, jorton
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]