summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2017-12-19 13:47:47 +0000
committerJim Jagielski <jim@apache.org>2017-12-19 13:47:47 +0000
commitbe2f15d0da16a82dd04bf20fa501fcc90847c59b (patch)
tree898d76710f69c69145f98466139b8fa70a42393b
parentd52cae411ba9a67ec732431646a75c4ad7717ed2 (diff)
downloadhttpd-be2f15d0da16a82dd04bf20fa501fcc90847c59b.tar.gz
uwsgi updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1818669 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS7
1 files changed, 5 insertions, 2 deletions
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