From: Christophe Jaillet <jailletc36@apache.org>
Date: Sun, 5 Apr 2020 07:24:07 +0000 (+0000)
Subject: easy proposals [skip ci]
X-Git-Tag: 2.4.44~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25bc5d00ab3f105ba69c1a19fcd985950fc9d67b;p=thirdparty%2Fapache%2Fhttpd.git

easy proposals [skip ci]

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

diff --git a/STATUS b/STATUS
index 1b377f790ca..1119f582049 100644
--- a/STATUS
+++ b/STATUS
@@ -157,6 +157,37 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              months/years without any action item :)
      ylavic: will look at it ASAP..
 
+  *) Easy patches: synch 2.4.x and trunk
+        - core/log: don't ignore some apr_procattr failures (clang scan-build)
+        - doxygen improvements
+        - core: Standardize order of "extern" and XXX_DECLARE_YYY
+        - mod_mime_magic: Fix some compilation warning when MIME_MAGIC_DEBUG is defined.
+        - mod_alias: style: cmd_rec at the bottom
+        - core: Fix a typo in a message
+        - mpm_winnt: malloc -> ap_malloc
+        - mod_usertrack: Slighly simplify code
+        - code: Parentheses around AP_BUCKET_IS_EOR argument
+        - mod_dialup: Fix a typo
+     trunk patch:
+        - http://svn.apache.org/r1534995
+        - http://svn.apache.org/r1560482
+        - http://svn.apache.org/r1728779
+        - http://svn.apache.org/r1805491
+        - http://svn.apache.org/r1861528
+        - http://svn.apache.org/r1868016
+        - http://svn.apache.org/r1874470
+        - http://svn.apache.org/r1874602
+        - http://svn.apache.org/r1875769
+        - http://svn.apache.org/r1875811
+     2.4.x patch: svn merge -c 1534995,1560482,1728779,1805491,1861528,1868016,1874470,1874602,1875769,1875811 ^/httpd/httpd/trunk . 
+     +1: jailletc36
+
+  *) core: default_handler: cleanup outputed brigade before leaving.
+     trunk patch:
+        - http://svn.apache.org/r1783041
+     2.4.x patch: svn merge -c 1783041 ^/httpd/httpd/trunk . 
+     +1: jailletc36
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]