summaryrefslogtreecommitdiff
path: root/STATUS
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2017-11-06 12:15:17 +0000
committerStefan Eissing <icing@apache.org>2017-11-06 12:15:17 +0000
commit6f91106c31ea0079aecfe91d125bd3e1ad0b6b9e (patch)
tree0c69cfbf96d999daa561b1f34320b6e2acb20275 /STATUS
parent458890766fb90298b64a743f08ee46edad3165c1 (diff)
downloadhttpd-6f91106c31ea0079aecfe91d125bd3e1ad0b6b9e.tar.gz
backport patch update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1814399 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'STATUS')
-rw-r--r--STATUS2
1 files changed, 1 insertions, 1 deletions
diff --git a/STATUS b/STATUS
index 7043c41833..aeb14b23f6 100644
--- a/STATUS
+++ b/STATUS
@@ -198,7 +198,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
in post_config safe.
trunk patch: svn merge -c 1809302,1809303,1809305,1809311,1809314,1809713 ^/httpd/httpd/trunk .
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/backport-module-flags.diff
- (merge with alterations for mmn etc.)
+ (merge with alterations for mmn etc., updated after review by Yann)
+1: icing, ylavic
*) core: A signal received while stopping could have crashed the main