You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2021/04/18 16:57:20 UTC

svn commit: r1888916 - /httpd/httpd/branches/2.4.x/STATUS

Author: ylavic
Date: Sun Apr 18 16:57:19 2021
New Revision: 1888916

URL: http://svn.apache.org/viewvc?rev=1888916&view=rev
Log:
Vote, promote. [skip ci]

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1888916&r1=1888915&r2=1888916&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun Apr 18 16:57:19 2021
@@ -150,6 +150,48 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1888087 ^/httpd/httpd/trunk .
      +1: icing, rpluem, covener
 
+  *) mod_lua: Support Lua 5.4 and use pkg-config to detect Lua
+     properly on Debian systems.
+     trunk patch: http://svn.apache.org/r1826206
+                  http://svn.apache.org/r1880678
+                  http://svn.apache.org/r1880743
+                  http://svn.apache.org/r1880924
+     2.4.x patch: svn merge -c 1826206,1880678,1880743,1880924 ^/httpd/httpd/trunk .
+     PR: https://github.com/apache/httpd/pull/176
+     +1: jorton, gbechis, ylavic
+
+  *) modules/http/http_core.c server/protocol.c:
+     Make sure that conn->keepalive is NOT reset after being set in ap_read_request().
+     trunk patch: http://svn.apache.org/r1887999
+     2.4.x patch: svn merge -c 1887999 ^/httpd/httpd/trunk .
+     +1: jfclere, covener, ylavic
+
+  *) 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, gbechis, ylavic
+
+  *) 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, gbechis, ylavic
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -161,16 +203,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     +1: minfrin
     ylavic: patch is 404
 
-  *) mod_lua: Support Lua 5.4 and use pkg-config to detect Lua
-     properly on Debian systems.
-     trunk patch: http://svn.apache.org/r1826206
-                  http://svn.apache.org/r1880678
-                  http://svn.apache.org/r1880743
-                  http://svn.apache.org/r1880924
-     2.4.x patch: svn merge -c 1826206,1880678,1880743,1880924 ^/httpd/httpd/trunk .
-     PR: https://github.com/apache/httpd/pull/176
-     +1: jorton, gbechis
-
    *) core/mod_ssl/mod_md:
      - adding new ap_ssl_*() functions for a backward
        compatible replacement of the major optional mod_ssl functions. This
@@ -188,22 +220,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      PR: https://github.com/apache/httpd/pull/179
      +1: icing
 
-  *) modules/http/http_core.c server/protocol.c:
-     Make sure that conn->keepalive is NOT reset after being set in ap_read_request().
-     trunk patch: http://svn.apache.org/r1887999
-     2.4.x patch: svn merge -c 1887999 ^/httpd/httpd/trunk .
-     +1: jfclere, covener
-
   *) mod_socache_shmcb: be safe from socache_shmcb_destroy() late call.  PR 59798
      trunk patch: http://svn.apache.org/r1888266
      2.4.x patch: svn merge -c 1888266 ^/httpd/httpd/trunk .
-     +1: 
+     +1: ylavic
 
   *) mod_cgid: Register cleanup for socket earlier to avoid possible leaks on
      error paths
      trunk patch: http://svn.apache.org/r1887727
      2.4.x patch: svn merge -c 1887727 ^/httpd/httpd/trunk .
-     +1: 
+     +1: ylavic
 
   *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
      trunk patch: http://svn.apache.org/r1884505
@@ -215,32 +241,6 @@ 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, gbechis
-
-  *) 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, gbechis
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]