X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=13d8a14517abb18cd15b7b82c171ef45bfe19ebe;hb=7637da3c79552ce54e8b71b880af799ddfd64eca;hp=902c485c77df242c48c6361b2e1d519221a55a8b;hpb=5b80466d0655d5cbdc3b65aca0de506de32e9499;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 902c485..13d8a14 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -1,5 +1,7 @@
 package Apache::MVC;
 
+our $VERSION = '2.04';
+
 use strict;
 use warnings;
 
@@ -17,8 +19,6 @@ if (APACHE2) {
 else { require Apache }
 require Apache::Request;
 
-our $VERSION = "0.4";
-
 sub get_request {
     my ( $self, $r ) = @_;
     $self->{ar} = Apache::Request->new($r);
@@ -43,7 +43,10 @@ sub parse_args {
 sub send_output {
     my $r = shift;
     $r->{ar}->content_type(
-        $r->{content_type} . "; encoding=" . $r->{document_encoding} );
+          $r->{content_type} =~ m/^text/
+        ? $r->{content_type} . "; charset=" . $r->{document_encoding}
+        : $r->{content_type}
+    );
     $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
     APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );