Propose

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

diff --git a/STATUS b/STATUS
index 3c1580ca45e3f5dd3ca30615612a70437994d542..0a3b39b8a9c34d1706d76a2f56d79f59b6736a31 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -210,7 +210,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions2.patch
     +1: minfrin
 
- * Tooling: Add a new way to document changes
+ *) Tooling: Add a new way to document changes
    Trunk version of patch:
       http://svn.apache.org/r1879822
       http://svn.apache.org/r1879831
@@ -220,6 +220,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       svn merge -c 1879822,1879831,1879840 ^/httpd/httpd/trunk .
    +1: rpluem,
 
+  *) mod_proxy_uwsgi: Avoid NULL pointer dereferences for empty environment variable values
+      http://svn.apache.org/r1879878
+   Backport version for 2.4.x of patch:
+      Trunk version of patch works
+      svn merge -c 1879878 ^/httpd/httpd/trunk .
+   +1: jailletc36,
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]