now also with encoding=

[maypole.git] / lib / Apache / MVC.pm

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 320b6b78252227139477c9c6e1ffc15e6f40c9c7..7d2114bd5952f3d6f9495a32faa30f0ecbf47131 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -6,7 +6,9 @@ use warnings;
 use base 'Maypole';
 use mod_perl;
 
-if ( $mod_perl::VERSION >= 1.99 ) {
+use constant APACHE2 => $mod_perl::VERSION >= 1.99;
+
+if (APACHE2) {
     require Apache2;
     require Apache::RequestRec;
     require Apache::RequestUtil;
@@ -40,9 +42,9 @@ sub parse_args {
 
 sub send_output {
     my $r = shift;
-    $r->{ar}->content_type( $r->{content_type} );
+    $r->{ar}->content_type( $r->{content_type} ."; encoding=".$r->{document_encoding} );
     $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
-    $r->{ar}->send_http_header;
+    APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );
 }
 
@@ -72,8 +74,8 @@ Apache::MVC - Apache front-end to Maypole
     package BeerDB;
     use base 'Apache::MVC';
     BeerDB->setup("dbi:mysql:beerdb");
-    BeerDB->config->{uri_base} = "http://your.site/";
-    BeerDB->config->{display_tables} = [qw[beer brewery pub style]];
+    BeerDB->config->uri_base("http://your.site/");
+    BeerDB->config->display_tables([qw[beer brewery pub style]]);
     # Now set up your database:
     # has-a relationships
     # untaint columns