From: Jim Jagielski <jim@apache.org>
Date: Tue, 19 Dec 2017 13:47:47 +0000 (+0000)
Subject: uwsgi updates
X-Git-Tag: 2.4.30~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be2f15d0da16a82dd04bf20fa501fcc90847c59b;p=apache

uwsgi updates



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

diff --git a/STATUS b/STATUS
index 7cb8a12358..87bafa7c80 100644
--- a/STATUS
+++ b/STATUS
@@ -227,11 +227,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1810363
                   http://svn.apache.org/r1810365
                   http://svn.apache.org/r1810447
+                  http://svn.apache.org/r1816919
+                  http://svn.apache.org/r1816922
+                  http://svn.apache.org/r1818013
                   http://svn.apache.org/r1818280
      2.4.x patch: trunk works (modulo CHANGES)
-                  svn merge -c r1810358,r1810362,r1810363,r1810365,r1810447,r1818280 ^/httpd/httpd/trunk .
+                  svn merge -c r1810358,r1810362,r1810363,r1810365,r1810447,r1816919,r1816922,r1818013,r1818280 ^/httpd/httpd/trunk .
+                  (or svn copy ...)
      +1: jim
-     jailletc36: r1816919, r1816922, r1818013 ?
 
   *) mod_ldap: PR61891: Failure to make progreass purging a mostly full cache.
      trunk patch: http://svn.apache.org/r1818040