Commit cd4e1611 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

On the 2.4.x branch: 

Merged /httpd/httpd/trunk:r1792212,1793525

mod_proxy_http2: adding support for Reverse Proxy Request headers.



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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.4.26



  *) mod_proxy_http2: adding support for Reverse Proxy Request headers.

     [Stefan Eissing]

     

  *) mod_http2: fixed possible deadlock that could occur when connections were 

     terminated early with ongoing streams. Fixed possible hanger with timeout

     on race when connection considers itself idle. [Stefan Eissing]

modules/http2/h2_proxy_session.c

+26 −0
Original line number Diff line number Diff line
@@ -742,6 +742,32 @@ static apr_status_t open_stream(h2_proxy_session *session, const char *url, 
    h2_proxy_req_make(stream->req, stream->pool, r->method, scheme,

                authority, path, r->headers_in);



    if (dconf->add_forwarded_headers) {

        if (PROXYREQ_REVERSE == r->proxyreq) {

            const char *buf;



            /* Add X-Forwarded-For: so that the upstream has a chance to

             * determine, where the original request came from.

             */

            apr_table_mergen(stream->req->headers, "X-Forwarded-For",

                             r->useragent_ip);



            /* Add X-Forwarded-Host: so that upstream knows what the

             * original request hostname was.

             */

            if ((buf = apr_table_get(r->headers_in, "Host"))) {

                apr_table_mergen(stream->req->headers, "X-Forwarded-Host", buf);

            }



            /* Add X-Forwarded-Server: so that upstream knows what the

             * name of this proxy server is (if there are more than one)

             * XXX: This duplicates Via: - do we strictly need it?

             */

            apr_table_mergen(stream->req->headers, "X-Forwarded-Server",

                             r->server->server_hostname);

        }

    }

    

    /* Tuck away all already existing cookies */

    stream->saves = apr_table_make(r->pool, 2);

    apr_table_do(add_header, stream->saves, r->headers_out, "Set-Cookie", NULL);

modules/http2/h2_version.h

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
 * @macro

 * Version number of the http2 module as c string

 */

#define MOD_HTTP2_VERSION "1.10.3"

#define MOD_HTTP2_VERSION "1.10.4"



/**

 * @macro
@@ -34,7 +34,7 @@ 
 * release. This is a 24 bit number with 8 bits for major number, 8 bits

 * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.

 */

#define MOD_HTTP2_VERSION_NUM 0x010a03

#define MOD_HTTP2_VERSION_NUM 0x010a04





#endif /* mod_h2_h2_version_h */