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

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 902c485..e14e40e 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -1,5 +1,7 @@
 package Apache::MVC;
 
+our $VERSION = '2.05';
+
 use strict;
 use warnings;
 
@@ -10,6 +12,7 @@ use constant APACHE2 => $mod_perl::VERSION >= 1.99;
 
 if (APACHE2) {
     require Apache2;
+    require Apache::RequestIO;
     require Apache::RequestRec;
     require Apache::RequestUtil;
     require APR::URI;
@@ -17,8 +20,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,8 +44,13 @@ sub parse_args {
 sub send_output {
     my $r = shift;
     $r->{ar}->content_type(
-        $r->{content_type} . "; encoding=" . $r->{document_encoding} );
-    $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
+          $r->{content_type} =~ m/^text/
+        ? $r->{content_type} . "; charset=" . $r->{document_encoding}
+        : $r->{content_type}
+    );
+    $r->{ar}->headers_out->set(
+        "Content-Length" => do { use bytes; length $r->{output} }
+    );
     APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );
 }