diff options
| author | Eric Covener <covener@apache.org> | 2024-06-24 19:22:51 +0200 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2024-06-24 19:22:51 +0200 |
| commit | 925b6f0ceb8983a11662b5f3a6f2fa75860c2cde (patch) | |
| tree | 40372f74b0a86da15b1e9502c9efa9549b16e202 /modules/metadata | |
| parent | mod_proxy: escape for non-proxypass configuration (diff) | |
| download | apache2-925b6f0ceb8983a11662b5f3a6f2fa75860c2cde.tar.xz apache2-925b6f0ceb8983a11662b5f3a6f2fa75860c2cde.zip | |
add ap_set_content_type_ex to differentiate
trusted sources
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1918551 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/metadata')
| -rw-r--r-- | modules/metadata/mod_headers.c | 8 | ||||
| -rw-r--r-- | modules/metadata/mod_mime_magic.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c index 77737d90ca..ae3f33069f 100644 --- a/modules/metadata/mod_headers.c +++ b/modules/metadata/mod_headers.c @@ -870,7 +870,7 @@ 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(r, process_tags(hdr, r)); + ap_set_content_type_ex(r, process_tags(hdr, r), 1); } apr_table_setn(headers, hdr->header, process_tags(hdr, r)); break; @@ -878,7 +878,7 @@ static int do_headers_fixup(request_rec *r, apr_table_t *headers, if (NULL == apr_table_get(headers, hdr->header)) { if (r->headers_in != headers && !ap_cstr_casecmp(hdr->header, "Content-Type")) { - ap_set_content_type(r, process_tags(hdr, r)); + ap_set_content_type_ex(r, process_tags(hdr, r), 1); } apr_table_setn(headers, hdr->header, process_tags(hdr, r)); } @@ -887,7 +887,7 @@ static int do_headers_fixup(request_rec *r, apr_table_t *headers, apr_table_unset(headers, hdr->header); if (r->headers_in != headers && !ap_cstr_casecmp(hdr->header, "Content-Type")) { - ap_set_content_type(r, NULL); + ap_set_content_type_ex(r, NULL, 1); } break; case hdr_echo: @@ -901,7 +901,7 @@ static int do_headers_fixup(request_rec *r, apr_table_t *headers, const char *repl = process_regexp(hdr, r->content_type, r); if (repl == NULL) return 0; - if (r->headers_in != headers) ap_set_content_type(r, repl); + if (r->headers_in != headers) ap_set_content_type_ex(r, repl, 1); } if (apr_table_get(headers, hdr->header)) { edit_do ed; diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c index e45f209b73..05585ba776 100644 --- a/modules/metadata/mod_mime_magic.c +++ b/modules/metadata/mod_mime_magic.c @@ -788,7 +788,7 @@ static int magic_rsl_to_request(request_rec *r) /* XXX: this could be done at config time I'm sure... but I'm * confused by all this magic_rsl stuff. -djg */ ap_content_type_tolower(tmp); - ap_set_content_type(r, tmp); + ap_set_content_type_ex(r, tmp, 1); if (state == rsl_encoding) { tmp = rsl_strdup(r, encoding_frag, @@ -2326,7 +2326,7 @@ static int revision_suffix(request_rec *r) /* extract content type/encoding/language from sub-request */ if (sub->content_type) { - ap_set_content_type(r, apr_pstrdup(r->pool, sub->content_type)); + ap_set_content_type_ex(r, apr_pstrdup(r->pool, sub->content_type), 1); #if MIME_MAGIC_DEBUG ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01557) MODNAME ": subrequest %s got %s", |