From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 13 Oct 2017 08:03:21 +0000 (+0000)
Subject: Propose.
X-Git-Tag: 2.4.29~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaee8f4381722e5e0438dc8e1deb6c3e376c5c75;p=thirdparty%2Fapache%2Fhttpd.git

Propose.


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

diff --git a/STATUS b/STATUS
index 9bc8782169c..c5433a54d4e 100644
--- a/STATUS
+++ b/STATUS
@@ -220,6 +220,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                    (merge with alterations for mmn etc.)
       +1: icing, ylavic
 
+   *) core: A signal received while stopping could have crashed the main
+      process.  PR 61558.
+      trunk patch: svn merge -c 1809881,1809973,1809976,1812075 ^/httpd/httpd/trunk .
+      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/stop_signals-PR61558.patch
+                   (merge without changes to motorz)
+      +1: ylavic,
+ 
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]