]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Backported [skip ci].
authorYann Ylavic <ylavic@apache.org>
Mon, 6 Sep 2021 10:04:09 +0000 (10:04 +0000)
committerYann Ylavic <ylavic@apache.org>
Mon, 6 Sep 2021 10:04:09 +0000 (10:04 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892979 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index adc3013e35a72d0a3876047a3b1127da1e4e1432..8293a15887c15980a6cc1ae65744ed6f5a797879 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -153,11 +153,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1892915 ^/httpd/httpd/trunk .
      +1: jailletc36, jorton, icing
 
-  *) mpm_prefork: mask signals during ap_run_child_init()
-     trunk patch: http://svn.apache.org/r1890465
-     2.4.x patch: svn merge -c 1890465 ^/httpd/httpd/trunk .
-     +1: jorton, icing, rpluem, ylavic
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]