From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 8 Dec 2015 11:22:11 +0000 (+0000)
Subject: h2_from_h1: To avoid any further confusion, r->err_headers should be cleared
X-Git-Tag: 2.5.0-alpha~2553
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a0e668a208ea1512d997c16dbd93abccab7d81a4;p=apache

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/trunk@1718569 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_from_h1.c b/modules/http2/h2_from_h1.c
index 4801ec5623..e4264dc409 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);
     }
     
     /*