diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:59:48 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:59:48 +0000 |
commit | 53ff966932ecf1aff29a072025fabbfc0c5bed54 (patch) | |
tree | f7d497a34d66ac0351363862cff1fd1287bbd282 /modules/dav/main | |
parent | Releasing progress-linux version 2.4.60-1~progress7.99u1. (diff) | |
download | apache2-53ff966932ecf1aff29a072025fabbfc0c5bed54.tar.xz apache2-53ff966932ecf1aff29a072025fabbfc0c5bed54.zip |
Merging upstream version 2.4.61.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'modules/dav/main')
-rw-r--r-- | modules/dav/main/mod_dav.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c index dea3f18..7a3eed7 100644 --- a/modules/dav/main/mod_dav.c +++ b/modules/dav/main/mod_dav.c @@ -355,7 +355,7 @@ static int dav_error_response(request_rec *r, int status, const char *body) r->status = status; r->status_line = ap_get_status_line(status); - ap_set_content_type(r, "text/html; charset=ISO-8859-1"); + ap_set_content_type_ex(r, "text/html; charset=ISO-8859-1", 1); /* begin the response now... */ ap_rvputs(r, @@ -386,7 +386,7 @@ static int dav_error_response_tag(request_rec *r, { r->status = err->status; - ap_set_content_type(r, DAV_XML_CONTENT_TYPE); + ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); ap_rputs(DAV_XML_HEADER DEBUG_CR "<D:error xmlns:D=\"DAV:\"", r); @@ -544,7 +544,7 @@ DAV_DECLARE(void) dav_begin_multistatus(apr_bucket_brigade *bb, { /* Set the correct status and Content-Type */ r->status = status; - ap_set_content_type(r, DAV_XML_CONTENT_TYPE); + ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); /* Send the headers and actual multistatus response now... */ ap_fputs(r->output_filters, bb, DAV_XML_HEADER DEBUG_CR @@ -2016,7 +2016,7 @@ static int dav_method_options(request_rec *r) /* send the options response */ r->status = HTTP_OK; - ap_set_content_type(r, DAV_XML_CONTENT_TYPE); + ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); /* send the headers and response body */ ap_rputs(DAV_XML_HEADER DEBUG_CR @@ -3328,7 +3328,7 @@ static int dav_method_lock(request_rec *r) (*locks_hooks->close_lockdb)(lockdb); r->status = HTTP_OK; - ap_set_content_type(r, DAV_XML_CONTENT_TYPE); + ap_set_content_type_ex(r, DAV_XML_CONTENT_TYPE, 1); ap_rputs(DAV_XML_HEADER DEBUG_CR "<D:prop xmlns:D=\"DAV:\">" DEBUG_CR, r); if (lock == NULL) |