]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Update Lua proposal, thanks to jailletc36 for catching missing commit.
authorJoe Orton <jorton@apache.org>
Fri, 19 Mar 2021 16:38:51 +0000 (16:38 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 19 Mar 2021 16:38:51 +0000 (16:38 +0000)
[skip ci]

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

STATUS

diff --git a/STATUS b/STATUS
index f1ef704eb375eaaa2aa66c3906fa82ef3caf962c..11c8fa38a48223d9ca517269b4ba177b9106ba0d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -164,10 +164,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1826206
                   http://svn.apache.org/r1880678
                   http://svn.apache.org/r1880743
-     2.4.x patch: svn merge -c 1826206,1880678,1880743 ^/httpd/httpd/trunk .
+                  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, ylavic,
-     jailletc36: r1880924 seems to be missing for <= Lua 5.1 compatibility.
+     +1: jorton, 
 
   *) mpm_event/worker: Adjust signal handler before unblocking. PR 64533.
      trunk patch: http://svn.apache.org/r1882370