diff options
Diffstat (limited to 'modules/http')
| -rw-r--r-- | modules/http/http_filters.c | 2 | ||||
| -rw-r--r-- | modules/http/http_protocol.c | 4 | ||||
| -rw-r--r-- | modules/http/http_request.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c index f20aee7..60b44d7 100644 --- a/modules/http/http_filters.c +++ b/modules/http/http_filters.c @@ -1261,7 +1261,7 @@ AP_DECLARE_NONSTD(int) ap_send_http_trace(request_rec *r) } } - ap_set_content_type(r, "message/http"); + ap_set_content_type_ex(r, "message/http", 1); /* Now we recreate the request, and echo it back */ diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index c31e873..3bc666e 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -1443,10 +1443,10 @@ AP_DECLARE(void) ap_send_error_response(request_rec *r, int recursive_error) request_conf->suppress_charset = 1; /* avoid adding default * charset later */ - ap_set_content_type(r, "text/html"); + ap_set_content_type_ex(r, "text/html", 1); } else { - ap_set_content_type(r, "text/html; charset=iso-8859-1"); + ap_set_content_type_ex(r, "text/html; charset=iso-8859-1", 1); } if ((status == HTTP_METHOD_NOT_ALLOWED) diff --git a/modules/http/http_request.c b/modules/http/http_request.c index d59cfe2..71ecc2b 100644 --- a/modules/http/http_request.c +++ b/modules/http/http_request.c @@ -708,7 +708,7 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r) r->args = rr->args; r->finfo = rr->finfo; r->handler = rr->handler; - ap_set_content_type(r, rr->content_type); + ap_set_content_type_ex(r, rr->content_type, AP_REQUEST_IS_TRUSTED_CT(r)); r->content_encoding = rr->content_encoding; r->content_languages = rr->content_languages; r->per_dir_config = rr->per_dir_config; |