]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Easy proposal
authorChristophe Jaillet <jailletc36@apache.org>
Thu, 7 Jan 2021 20:07:27 +0000 (20:07 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Thu, 7 Jan 2021 20:07:27 +0000 (20:07 +0000)
[skip ci]

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

STATUS

diff --git a/STATUS b/STATUS
index 24ca39744e7397ef31d2e8ac75f2f6c60b97695e..e4737ebb5af23060548825ba3f91a0284f751def 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -312,6 +312,23 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              to SetEnv proxy-sendcl for that (2.4 compat).
   [ End of series ]
 
+  *) Easy patches: synch 2.4.x and trunk
+        - mod_dav: save a few cycles
+        - mod_{ssl,md}: init_stapling_status hooks should return an int
+        - util_md5: avoid temporary stack result in ap_md5_binary()
+        - mod_proxy_balancer: Add a missing </tr>
+        - mod_md: get_stapling_status hooks should return an int
+        - mod_session: Improve a message about SessionExpiryUpdateInterval values
+     trunk patch:
+          http://svn.apache.org/r1837388
+          http://svn.apache.org/r1876549
+          http://svn.apache.org/r1877551
+          http://svn.apache.org/r1882210
+          http://svn.apache.org/r1882399
+          http://svn.apache.org/r1883414
+     2.4.x patch: svn merge -c 1837388,1876549,1877551,1882210,1882399,1883414 ^/httpd/httpd/trunk . 
+     +1: jailletc36
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]