From: Luca Toscano <elukey@apache.org>
Date: Fri, 30 Dec 2016 15:04:08 +0000 (+0000)
Subject: Propose backport
X-Git-Tag: 2.4.26~417
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24855ae39928d3ac6a2d9dd9208e7fb521799926;p=thirdparty%2Fapache%2Fhttpd.git

Propose backport

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

diff --git a/STATUS b/STATUS
index 2cf13fa5a2c..8912ad65f10 100644
--- a/STATUS
+++ b/STATUS
@@ -154,6 +154,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4 patch: trunk works (modulo CHANGES)
      +1: ylavic, jim
 
+  *) mod_proxy_fcgi: Return HTTP 504 rather than 503 in case of proxy timeout.
+     trunk patch: http://svn.apache.org/r1775858
+     2.4 patch: trunk works (modulo CHANGES)
+     +1: elukey
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entried should be added at the START of the list ]