From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 18 Apr 2021 08:05:16 +0000 (+0000)
Subject: Propose
X-Git-Tag: 2.4.47~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=019cfc6c9a91443b9e33d14d7488dc3097b7640a;p=thirdparty%2Fapache%2Fhttpd.git

Propose

[skip ci]

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

diff --git a/STATUS b/STATUS
index c2c477c1554..01b8a18300f 100644
--- a/STATUS
+++ b/STATUS
@@ -215,6 +215,31 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      is not the right fix, then it should be removed from trunk.
      Putting it here is a way to revive the discussion
 
+  *) Add missing pool tags to help debugging
+     trunk patch: http://svn.apache.org/r1876599
+     2.4.x patch: http://home.apache.org/~jailletc36/r1876599.diff
+     +1: jailletc36
+
+  *) Easy patches: synch 2.4.x and trunk
+         - doxygen: Correct doxygen groupname
+         - .gdbinit: align columns
+         - .gdbinit: fix indentation
+         - mod_dav: Add specific logs for different modes
+         - core: ap_pbase64encode(): save double NUL byte allocation and assignment
+         - core: ap_pbase64decode(): save double NUL byte allocation and assignment
+         - support: Fix a typo in a comment
+         - proxy_util.c: Fix leak in error path in the do_malloc case
+     trunk patch:
+          http://svn.apache.org/r1730128
+          http://svn.apache.org/r1878140
+          http://svn.apache.org/r1878265
+          http://svn.apache.org/r1881736
+          http://svn.apache.org/r1882775
+          http://svn.apache.org/r1883872
+          http://svn.apache.org/r1884509
+          http://svn.apache.org/r1887720
+     2.4.x patch: svn merge -c 1730128,1878140,1878265,1881736,1882775,1883872,1884509,1887720 ^/httpd/httpd/trunk .
+     +1: jailletc36
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]