From 9ee1ce5a7c80079c6eacfcfbc13074dc9e44fc96 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Fri, 11 Apr 2014 20:11:33 +0000 Subject: [PATCH] Proposals git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1586764 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/STATUS b/STATUS index 86fbaf868d..ce5f89db69 100644 --- a/STATUS +++ b/STATUS @@ -280,6 +280,32 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works (modulo CHANGES) +1: kbrand + * core: synch with trunk + - follow-up to r813376: finish reverting r808965 (ServerTokens set foo) + - tweak syntax strings for ServerTokens + trunk patch: https://svn.apache.org/r1514255 + https://svn.apache.org/r1514267 + 2.4.x patch: http://people.apache.org/~jailletc36/r1514255.patch + +1: jailletc36 + + * mod_proxy_html: Do not delete the wrong data from HTML code when a + "http-equiv" meta tag specifies a Content-Type behind any other "http-equiv" + meta tag. PR 56287 [Micha Lenk ] + trunk patch: https://svn.apache.org/r1584878 + 2.4.x patch: trunk patch works (modulo CHANGES) + +1: jailletc36 + + * mod_proxy_html: Do not scan past the end of the buffer. + trunk patch: https://svn.apache.org/r1584884 + 2.4.x patch: trunk patch works + +1: jailletc36 + + * mod_proxy_html: Do not perform a p+= 7 that could go past the end of the buffer + trunk patch: https://svn.apache.org/r1584896 + 2.4.x patch: trunk patch works + +1: jailletc36 + + OTHER PROPOSALS * A list of further possible backports can be found at: -- 2.50.1