summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2018-02-16 14:52:51 +0000
committerYann Ylavic <ylavic@apache.org>2018-02-16 14:52:51 +0000
commit7301e2d3762adffad70753bea09e6227351eed59 (patch)
treec93b0b5b18ff2360a23d95b6d07bd64311c8eb26
parent2d9b7d53edffc0a9b6b89a645062f189fa168539 (diff)
downloadhttpd-7301e2d3762adffad70753bea09e6227351eed59.tar.gz
Clarify merge note.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824501 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS3
1 files changed, 2 insertions, 1 deletions
diff --git a/STATUS b/STATUS
index d6f16c950d..ea410dca93 100644
--- a/STATUS
+++ b/STATUS
@@ -169,7 +169,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
http://svn.apache.org/r1824497
2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-event-lingering_close_in_worker.patch
(trunk works if mpm_queue above is merged first, otherwise
- the mpm_queue can be synchronized after this merge...)
+ the mpm_queue branch can also be synchronized after this
+ merge, YMMV :)
+1: ylavic,
*) mod_ssl: Introduce SSLPolicy/SSLPolicyDefine directives.