]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Easy proposals to synch with trunk
authorChristophe Jaillet <jailletc36@apache.org>
Sat, 19 Feb 2022 16:07:03 +0000 (16:07 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Sat, 19 Feb 2022 16:07:03 +0000 (16:07 +0000)
[skip ci]

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

STATUS

diff --git a/STATUS b/STATUS
index 6006a3456f5d773c2fea44784564d49d790fccd7..38c56ec93f245a3d168b1890f64db565ce9a85a1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -312,6 +312,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        PR: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/275.diff
      +1: icing,
 
+  *) Easy patches: synch 2.4.x and trunk
+         - mod_ssl: Fix a few warnings on 64 bits windows compilation
+         - ap_escape_quotes(): Remove unneeded checks to improve performance
+         - test/time-sem.c: unlock the accept mutex before exiting (error conditions)
+         - mod_ext_filter: Fix a spurious -1 used as a APR_SIZE_T_FMT in an error message
+         - mod_sed: fix some format string (s/lld/APR_INT64_T_FMT/)
+     trunk patch:
+          https://svn.apache.org/r1881379
+          https://svn.apache.org/r1892422
+          https://svn.apache.org/r1893011
+          https://svn.apache.org/r1897270
+          https://svn.apache.org/r1897271
+     2.4.x patch: svn merge -c 1881379,1892422,1893011,1897270,1897271 ^/httpd/httpd/trunk .
+     +1: jailletc36
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]