summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbenjamin.dauvergne <benjamin.dauvergne@a716ebb1-153a-0410-b759-cfb97c6a1b53>2012-10-09 08:41:54 +0000
committerbenjamin.dauvergne <benjamin.dauvergne@a716ebb1-153a-0410-b759-cfb97c6a1b53>2012-10-09 08:41:54 +0000
commit2ae6ed1041dbff7a1f9c49d5e01e45e22071c5db (patch)
tree396a71046b084986289583301f24b716d07cf886
parent0e35cd2063aa3e9857e59e62a9ffddcdbd21aaa0 (diff)
downloadmod_auth_mellon-2ae6ed1041dbff7a1f9c49d5e01e45e22071c5db.tar.gz
mod_auth_mellon-2ae6ed1041dbff7a1f9c49d5e01e45e22071c5db.tar.xz
mod_auth_mellon-2ae6ed1041dbff7a1f9c49d5e01e45e22071c5db.zip
replace all assignment to r->content_type by calls to ap_set_content_type
git-svn-id: https://modmellon.googlecode.com/svn/trunk@169 a716ebb1-153a-0410-b759-cfb97c6a1b53
-rw-r--r--auth_mellon_handler.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/auth_mellon_handler.c b/auth_mellon_handler.c
index 2d4003a..200c37f 100644
--- a/auth_mellon_handler.c
+++ b/auth_mellon_handler.c
@@ -582,7 +582,7 @@ static int am_return_logout_response(request_rec *r,
return HTTP_SEE_OTHER;
} else if (profile->msg_body) {
/* SOAP binding response */
- r->content_type = "text/xml";
+ ap_set_content_type(r, "text/xml");
ap_rputs(profile->msg_body, r);
return OK;
} else {
@@ -2386,15 +2386,14 @@ static int am_handle_repost(request_rec *r)
}
if (charset != NULL) {
- r->content_type = apr_psprintf(r->pool,
- "text/html; charset=\"%s\"",
- charset);
+ ap_set_content_type(r, apr_psprintf(r->pool,
+ "text/html; charset=\"%s\"", charset));
charset = apr_psprintf(r->pool, " accept-charset=\"%s\"", charset);
} else {
- r->content_type = "text/html";
+ ap_set_content_type(r, "text/html");
charset = (char *)"";
}
-
+
output = apr_psprintf(r->pool,
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n"
"<html>\n"
@@ -2445,7 +2444,7 @@ static int am_handle_metadata(request_rec *r)
if (data == NULL)
return HTTP_INTERNAL_SERVER_ERROR;
- r->content_type = "application/samlmetadata+xml";
+ ap_set_content_type(r, "application/samlmetadata+xml");
ap_rputs(data, r);