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 9ce51e6f18d2148d1bb0e4b92cdfa987f9a53dfd..ac16da68b4001066ea6904819c477f63d79c4c14 100644 (file)
--- 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.