From: Eric Covener <covener@apache.org>
Date: Fri, 18 Jul 2014 11:35:24 +0000 (+0000)
Subject: Update porposal -- Ruediger spotted the hand-merge error:
X-Git-Tag: 2.2.28~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42358ee189870bf55b8df3c2f585a438bf70dfda;p=thirdparty%2Fapache%2Fhttpd.git

Update porposal -- Ruediger spotted the hand-merge error:

+                    if (!apr_is_empty_table(rp->trailers_in)) {
+                        apr_table_do(add_trailers, rp->trailers_out,
                                                    ^
+                                rp->trailers_in, NULL);
+                        apr_table_clear(rp->trailers_in);
+                    }



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

diff --git a/STATUS b/STATUS
index 9ce51e6f18d..ac16da68b40 100644
--- a/STATUS
+++ b/STATUS
@@ -113,7 +113,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1610814 
                   http://svn.apache.org/r1610686 (mod_log_config ^XX support) 
                   http://svn.apache.org/r1610707 (mod_log_cofnig ^XX support)
-     2.2.x patch:  http://people.apache.org/~covener/patches/httpd-2.2.x-trailers.diff
+     2.2.x patch:  http://people.apache.org/~covener/patches/httpd-2.2.x-trailers-2.diff
      +1: covener
     
    * mod_proxy: Don't reuse a SSL backend connection whose SNI differs. PR 55782.