From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 13 Nov 2014 06:59:52 +0000 (+0000)
Subject: Easy proposals to synch 2.4 and trunk
X-Git-Tag: 2.4.11~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=979ca4c5b0663268510f50e045b2bac85717b644;p=apache

Easy proposals to synch 2.4 and trunk

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

diff --git a/STATUS b/STATUS
index f05362f5e4..9cc427dd8d 100644
--- a/STATUS
+++ b/STATUS
@@ -209,6 +209,26 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1 covener
 
+   * easy proposals to synch 2.4.x and trunk
+        - ssl: Axe needless string duplication in setup for call to apr_proc_create()
+        - Fix sscanf format spotted by cppcheck
+        - fix indent.
+        - fix style
+        - Private function doesn't need ap_ prefix.
+        - tab vs space
+        - rename variables: s should be the server_rec
+     trunk patch: http://svn.apache.org/r1533765
+                  http://svn.apache.org/r1621419
+                  http://svn.apache.org/r1638159
+                  http://svn.apache.org/r1638188
+                  http://svn.apache.org/r1601603
+                  http://svn.apache.org/r1638412
+                  http://svn.apache.org/r1418763
+     2.4.x patch: trunk works
+                  http://people.apache.org/~jailletc36/backport10.patch
+     +1: jailletc36
+     
+
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: