From 7301e2d3762adffad70753bea09e6227351eed59 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 16 Feb 2018 14:52:51 +0000 Subject: Clarify merge note. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824501 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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. -- cgit v1.2.1