From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 26 Mar 2016 07:03:23 +0000 (+0000)
Subject: propose
X-Git-Tag: 2.4.20~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=143967dbc7b3f82fe35b041f2afa984b3694fe1f;p=apache

propose

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

diff --git a/STATUS b/STATUS
index d721af6555..64d322cb39 100644
--- a/STATUS
+++ b/STATUS
@@ -182,7 +182,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Trunk patch: r1645529 (works)
      2.4.x patch which adds CHANGES: https://emptyhammock.com/media/downloads/r1645529-to-2.4.x.txt
      +1: trawick
- 
+
+  *) Synch 2.4.x with trunk - merge some multi-line log messages in MPMs (+ one style 
+     adjustment in mpm_netware.c, merged accidendly)
+     Trunk patch: http://svn.apache.org/r1731929
+                  http://svn.apache.org/r1736681
+     2.4.x patch: http://home.apache.org/~jailletc36/1731929.diff
+     +1: jailletc36
+
+
 PATCHES/ISSUES THAT ARE BEING WORKED
 
   *) http: Don't remove the Content-Length of zero from a HEAD response if