From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 25 Jan 2013 22:17:38 +0000 (+0000)
Subject: Propose
X-Git-Tag: 2.4.4~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7827f564ed667c8cedd3f6ed3112b9b8bd1fd601;p=apache

Propose

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

diff --git a/STATUS b/STATUS
index 873692e3b2..2f28ea6df1 100644
--- a/STATUS
+++ b/STATUS
@@ -198,6 +198,33 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     +1: druggeri
     covener: minor MMM bump?  (Thanks for reminder. This is done. -druggeri)
 
+  * various small things to keep 2.4.x in line with trunk
+        1384913: Add a few AP_DEBUG_ASSERT()s for the benefit of clang
+        1399687: style tweak
+        1419719: No need to clear memory that is fully initialized just the line after.
+        1419755: Avoid unnecessary %s substitution
+        1416278: Avoid processing some files twice if APR_INCLUDEDIR and 
+                 APU_INCLUDEDIR containin the same path but differing in
+                 doubled slashes.
+        1330189: Fixed position of the NEED_ENHANCED_ESCAPES define.
+    trunk patches:
+        http://svn.apache.org/viewvc?view=revision&revision=1384913
+        http://svn.apache.org/viewvc?view=revision&revision=1399687
+        http://svn.apache.org/viewvc?view=revision&revision=1419719
+        http://svn.apache.org/viewvc?view=revision&revision=1419755
+        http://svn.apache.org/viewvc?view=revision&revision=1416278
+        http://svn.apache.org/viewvc?view=revision&revision=1330189  
+    2.4.x patch: http://people.apache.org/~jailletc36/backport4.patch
+    +1: jailletc36
+
+  * add new ap_bin2hex() utility function.
+    This is needed to incorporate other changes that make use of this new function.
+    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1422549
+                 http://svn.apache.org/viewvc?view=revision&revision=1422712
+    2.4.x patch: trunk patches works (modulo an offset for httpd.h and minor MMN dump)
+    +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.