From a1cceeaa32dca5d615700c97ff8bb1cbe35e5d19 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Thu, 17 Apr 2014 13:57:59 +0000 Subject: [PATCH] Vote and promote r1514255. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1588254 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/STATUS b/STATUS index 8b9b544ed8..0cbd0a3773 100644 --- a/STATUS +++ b/STATUS @@ -100,6 +100,14 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + * 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, gsmith, ylavic + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -212,14 +220,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk patch works (modulo CHANGES) +1: kbrand, jorton - * 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, gsmith - * mod_proxy_wstunnel: wstunnel rollup for connection handling trunk patch: http://svn.apache.org/r1587036 (set backend->close) http://svn.apache.org/r1587040 (remove reqtimeout) -- 2.50.1