From: Eric Covener <covener@apache.org>
Date: Wed, 15 Apr 2015 14:03:44 +0000 (+0000)
Subject: merge
X-Git-Tag: 2.4.13~249
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22be05f5df91d88257f701917e399c2dd6b1db04;p=thirdparty%2Fapache%2Fhttpd.git

merge


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

diff --git a/STATUS b/STATUS
index f153e8a0818..f16529be5af 100644
--- a/STATUS
+++ b/STATUS
@@ -314,9 +314,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
   *) mod_logio: Log time-to-first-byte via %^FB
      trunk patch: http://svn.apache.org/r1671918
+                  http://svn.apache.org/r1673113
      2.4.x patch: trunk works (modulo CHANGES)
-     +1: covener
-     ylavic: +1 with http://svn.apache.org/r1673113
+     +1: covener, ylavic
 
   *) mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad
      Gateway) when no response is ever received from the backend.