diff options
| -rw-r--r-- | changes-entries/h2_proxy_content_type.txt | 4 | ||||
| -rw-r--r-- | modules/http2/h2_proxy_session.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes-entries/h2_proxy_content_type.txt b/changes-entries/h2_proxy_content_type.txt new file mode 100644 index 0000000000..d35f7c2ea7 --- /dev/null +++ b/changes-entries/h2_proxy_content_type.txt @@ -0,0 +1,4 @@ + *) mod_proxy_http2: apply the standard httpd content type handling + to responses from the backend, as other proxy modules do. Fixes PR 66391. + Thanks to Jérôme Billiras for providing the patch. + [Stefan Eissing]
\ No newline at end of file diff --git a/modules/http2/h2_proxy_session.c b/modules/http2/h2_proxy_session.c index 3da57f9e73..c3f2ff3010 100644 --- a/modules/http2/h2_proxy_session.c +++ b/modules/http2/h2_proxy_session.c @@ -447,6 +447,7 @@ static void h2_proxy_stream_end_headers_out(h2_proxy_stream *stream) h2_proxy_session *session = stream->session; request_rec *r = stream->r; apr_pool_t *p = r->pool; + const char *buf; /* Now, add in the cookies from the response to the ones already saved */ apr_table_do(add_header, stream->saves, r->headers_out, "Set-Cookie", NULL); @@ -456,6 +457,10 @@ static void h2_proxy_stream_end_headers_out(h2_proxy_stream *stream) apr_table_unset(r->headers_out, "Set-Cookie"); r->headers_out = apr_table_overlay(p, r->headers_out, stream->saves); } + + if ((buf = apr_table_get(r->headers_out, "Content-Type"))) { + ap_set_content_type(r, apr_pstrdup(p, buf)); + } /* handle Via header in response */ if (session->conf->viaopt != via_off |