backport 1927032 from trunk

covener · covener · commit b3d3ded28881 · 2025-07-07T12:01:02.000Z
header only Reviewed By: rpluem, jorton, ylavic git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1927040 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
@@ -784,15 +784,15 @@ static int do_headers_fixup(request_rec *r, apr_table_t *headers,
         case hdr_set:
             if (r->headers_in != headers &&
                 !ap_cstr_casecmp(hdr->header, "Content-Type")) {
-                 ap_set_content_type_ex(r, process_tags(hdr, r), 1);
+                 ap_set_content_type(r, process_tags(hdr, r));
             }
             apr_table_setn(headers, hdr->header, process_tags(hdr, r));
             break;
         case hdr_setifempty:
             if (NULL == apr_table_get(headers, hdr->header)) {
                 if (r->headers_in != headers &&
                     !ap_cstr_casecmp(hdr->header, "Content-Type")) {
-                    ap_set_content_type_ex(r, process_tags(hdr, r), 1);
+                    ap_set_content_type(r, process_tags(hdr, r));
                 }
                 apr_table_setn(headers, hdr->header, process_tags(hdr, r));
             }

Original file line number	Diff line number	Diff line change
`@@ -784,15 +784,15 @@ static int do_headers_fixup(request_rec r, apr_table_t headers,`
`784`	`784`	`case hdr_set:`
`785`	`785`	`if (r->headers_in != headers &&`
`786`	`786`	`!ap_cstr_casecmp(hdr->header, "Content-Type")) {`
`787`		`- ap_set_content_type_ex(r, process_tags(hdr, r), 1);`
	`787`	`+ ap_set_content_type(r, process_tags(hdr, r));`
`788`	`788`	`}`
`789`	`789`	`apr_table_setn(headers, hdr->header, process_tags(hdr, r));`
`790`	`790`	`break;`
`791`	`791`	`case hdr_setifempty:`
`792`	`792`	`if (NULL == apr_table_get(headers, hdr->header)) {`
`793`	`793`	`if (r->headers_in != headers &&`
`794`	`794`	`!ap_cstr_casecmp(hdr->header, "Content-Type")) {`
`795`		`- ap_set_content_type_ex(r, process_tags(hdr, r), 1);`
	`795`	`+ ap_set_content_type(r, process_tags(hdr, r));`
`796`	`796`	`}`
`797`	`797`	`apr_table_setn(headers, hdr->header, process_tags(hdr, r));`
`798`	`798`	`}`