From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 8 Dec 2015 13:08:13 +0000 (+0000)
Subject: Merge r1718569 from trunk.
X-Git-Tag: 2.4.18~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=718df0d73414453055b2ec3ba8e3aac86b7d4195;p=apache

Merge r1718569 from trunk.

h2_from_h1: To avoid any further confusion, r->err_headers should be cleared
once merged into r->headers_out.


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

diff --git a/modules/http2/h2_from_h1.c b/modules/http2/h2_from_h1.c
index 755b7d6815..0b5060d4d1 100644
--- a/modules/http2/h2_from_h1.c
+++ b/modules/http2/h2_from_h1.c
@@ -358,6 +358,7 @@ static h2_response *create_response(h2_from_h1 *from_h1, request_rec *r)
     if (!apr_is_empty_table(r->err_headers_out)) {
         r->headers_out = apr_table_overlay(r->pool, r->err_headers_out,
                                            r->headers_out);
+        apr_table_clear(r->err_headers_out);
     }
     
     /*