Commit abbeea14 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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
parent 210ebddf

modules/http2/h2_from_h1.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

    }

    

    /*