summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2008-01-02 19:29:59 +0000
committerJim Jagielski <jim@apache.org>2008-01-02 19:29:59 +0000
commit2702f2eeea9e7ef8cf059128014145a3db97705a (patch)
treef37675089cbd77ad3d07e0f1ee2451520304a8f6 /modules
parent08845c1f93cb5c280f540c8046f5c4ea022b79ee (diff)
downloadhttpd-2702f2eeea9e7ef8cf059128014145a3db97705a.tar.gz
http://svn.apache.org/viewvc?rev=606693&view=rev
http://svn.apache.org/viewvc?rev=607276&view=rev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@608194 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
-rw-r--r--modules/dav/main/mod_dav.c2
-rw-r--r--modules/experimental/util_ldap.c2
-rw-r--r--modules/generators/mod_info.c2
-rw-r--r--modules/proxy/proxy_ftp.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index 8740c17454..3d3b47bb60 100644
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -317,7 +317,7 @@ static int dav_error_response(request_rec *r, int status, const char *body)
/* ### I really don't think this is needed; gotta test */
r->status_line = ap_get_status_line(status);
- ap_set_content_type(r, "text/html");
+ ap_set_content_type(r, "text/html; charset=ISO-8859-1");
/* begin the response now... */
ap_rvputs(r,
diff --git a/modules/experimental/util_ldap.c b/modules/experimental/util_ldap.c
index a55256d887..adaccb3242 100644
--- a/modules/experimental/util_ldap.c
+++ b/modules/experimental/util_ldap.c
@@ -139,7 +139,7 @@ int util_ldap_handler(request_rec *r)
return DECLINED;
}
- r->content_type = "text/html";
+ r->content_type = "text/html; charset=ISO-8859-1";
if (r->header_only)
return OK;
diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c
index a6973ddb7a..eb72844232 100644
--- a/modules/generators/mod_info.c
+++ b/modules/generators/mod_info.c
@@ -318,7 +318,7 @@ static int display_info(request_rec *r)
if (r->method_number != M_GET)
return DECLINED;
- ap_set_content_type(r, "text/html");
+ ap_set_content_type(r, "text/html; charset=ISO-8859-1");
ap_rputs(DOCTYPE_HTML_3_2
"<html><head><title>Server Information</title></head>\n", r);
diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index c02f0f48e1..3cf6d31fbb 100644
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -1702,7 +1702,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
/* set content-type */
if (dirlisting) {
- ap_set_content_type(r, "text/html");
+ ap_set_content_type(r, "text/html; charset=ISO-8859-1");
}
else {
if (r->content_type) {