From: Jeff Trawick <trawick@apache.org>
Date: Tue, 17 Jun 2014 12:15:27 +0000 (+0000)
Subject: r1592032 doesn't merge cleanly anymore, so provide a patch
X-Git-Tag: 2.4.10~121
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2e043583724914a0558469828ae26e76fe0b1ab;p=apache

r1592032 doesn't merge cleanly anymore, so provide a patch


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

diff --git a/STATUS b/STATUS
index 183aaf583a..365db68dd8 100644
--- a/STATUS
+++ b/STATUS
@@ -258,13 +258,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    * mod_proxy_fcgi: better error messages, and fix an old bug where the error
                      condition was forgotten
      trunk patch: http://svn.apache.org/r1592032
-     2.4.x patch: trunk patch works
+     2.4.x patch: http://people.apache.org/~trawick/r1592032.txt
      +1: trawick, ylavic
-     ylavic: with r1603122?
-     trawick: I added r1603122 to the fix-regression proposal at the top.
-              r1592032 does fix an old bug similar to what you fixed in 
-              r1603122, but I think that r1603122 should be grouped with
-              the other follow-ups to r1601749.  (BTW, thanks!!!)
 
 OTHER PROPOSALS