From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 28 Jun 2013 04:59:33 +0000 (+0000)
Subject: Propose easy votes to keep 2.4 in sync with trunk
X-Git-Tag: 2.4.5~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9af38f58702cd55893b61dfeadbe00b1c32dfee;p=apache

Propose easy votes to keep 2.4 in sync with trunk

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

diff --git a/STATUS b/STATUS
index e0067fa59f..1435cff56e 100644
--- a/STATUS
+++ b/STATUS
@@ -215,6 +215,22 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              time when we can just fix the underlying problem instead.
          jj: Agree w/ minfrin
 
+  * Some easy votes to keep 2.4 in line with trunk
+    - mod_slotmem_shm: Replace duplicate log tags
+    - mpm/event: Check that AsyncRequestWorkerFactor is not negative (PR 54254)
+    - remove unneeded include statements
+    - mod_cache_disk: Name pool + concat string at compile time when possible
+    - mod_ratelimit (rate_limit_filter): Log the error code
+    - mod_authnz_ldap: fix typo
+    trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1406068
+                 https://svn.apache.org/viewvc?view=revision&revision=1425777
+                 https://svn.apache.org/viewvc?view=revision&revision=1427546
+                 https://svn.apache.org/viewvc?view=revision&revision=1462643
+                 https://svn.apache.org/viewvc?view=revision&revision=1487530
+                 https://svn.apache.org/viewvc?view=revision&revision=1493330
+    2.4.x patch: trunk patch works
+    +1: jailletc36
+
 A list of further possible backports can be found at:                                                                                                                                   
     http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt
 If you want to propose one of those, please still add them here.