changed to set document encoding from config->{document_encoding}

defaults to utf-8

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@189 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index f7eb317280b187ad15c6c24f4964742defc3ad34..3294df0490a32d579d0bc224f09be96efdc20056 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -42,7 +42,7 @@ sub parse_args {
 
 sub send_output {
     my $r = shift;
-    $r->{ar}->content_type( $r->{content_type} );
+    $r->{ar}->content_type( $r->{content_type}."; charset=".$r->{document_encoding} );
     $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
     APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );

diff --git a/lib/CGI/Maypole.pm b/lib/CGI/Maypole.pm
index e112913c0d5b5f55d214892868ad36b191ad4983..b937d8279a6774e58edf5f99ae0aa1c2fd1ed804 100644 (file)
--- a/lib/CGI/Maypole.pm
+++ b/lib/CGI/Maypole.pm
@@ -40,6 +40,7 @@ sub send_output {
     my $r = shift;
     print $r->{cgi}->header(
         -type           => $r->{content_type},
+        -charset       => $r->{document_encoding},
         -content_length => length $r->{output},
     );
     print $r->{output};