From 2bceb10b5fd06e8e0867cbc6d72a16cbaae35803 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 14 Dec 2009 18:16:47 -0500
Subject: 404/goto: Fix 404 display of utf-8 pages.

Problem here was that no charset http header was being sent.

I fixed this globally by making cgi_custom_failure send the header.
Required changing its parameters.
---
 IkiWiki/CGI.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/CGI.pm')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 9277223f0..866711a71 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -235,11 +235,15 @@ sub cgi_prefs ($$) {
 	showform($form, $buttons, $session, $q);
 }
 
-sub cgi_custom_failure ($$) {
-	my $header=shift;
+sub cgi_custom_failure ($$$) {
+	my $q=shift;
+	my $httpstatus=shift;
 	my $message=shift;
 
-	print $header;
+	print $q->header(
+		-status => $httpstatus,
+		-charset => 'utf-8',
+	);
 	print $message;
 
 	# Internet Explod^Hrer won't show custom 404 responses
@@ -274,7 +278,7 @@ sub check_banned ($$) {
 		$session->delete();
 		cgi_savesession($session);
 		cgi_custom_failure(
-			$q->header(-status => "403 Forbidden"),
+			$q, "403 Forbidden",
 			gettext("You are banned."));
 	}
 }
-- 
cgit v1.2.3