summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2018-02-13 22:37:18 +0000
committerGraham Leggett <minfrin@apache.org>2018-02-13 22:37:18 +0000
commit90793a4c7028f1a4a060954025dc1666b9f869d3 (patch)
tree66c893be38c022c468c5205f796229d3a4c8b4f3
parent843442c76a6887a7360d5d299b12871dcff5fdcb (diff)
downloadhttpd-90793a4c7028f1a4a060954025dc1666b9f869d3.tar.gz
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824183 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS32
1 files changed, 16 insertions, 16 deletions
diff --git a/STATUS b/STATUS
index 0821aaf733..af8f39bf9a 100644
--- a/STATUS
+++ b/STATUS
@@ -119,6 +119,22 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
+ *) mod_proxy_uwsgi: Add in UWSGI proxy (sub)module
+ trunk patch: http://svn.apache.org/r1810358
+ http://svn.apache.org/r1810362
+ 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,r1816919,r1816922,r1818013,r1818280 ^/httpd/httpd/trunk .
+ (or svn copy ...)
+ +1: jim, icing, minfrin
+ icing: tested on ubuntu 16.04 with a simple uwsgi python app.
+
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
@@ -173,22 +189,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
only (thus less useful too...).
jim: Can docco patch be post-backport?
- *) mod_proxy_uwsgi: Add in UWSGI proxy (sub)module
- trunk patch: http://svn.apache.org/r1810358
- http://svn.apache.org/r1810362
- 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,r1816919,r1816922,r1818013,r1818280 ^/httpd/httpd/trunk .
- (or svn copy ...)
- +1: jim, icing
- icing: tested on ubuntu 16.04 with a simple uwsgi python app.
-
*) proxy_util: Schemes and hostnames that are "too long" are
no longer automatically fatal errors but are instead logged
and truncated, at which point the admin can determine if that