X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=0921412afbaf1f556d2e86f30a7de82664296433;hb=271fd90b8a1b9f843853601a75a1334407ff87c4;hp=0f91e9a853d7c3deb1eefd34cce8371f0eeb66eb;hpb=7913f720113bfd85b59a9fed57a60ec7a665fb39;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 0f91e9a..0921412 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -12,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;
@@ -29,6 +30,7 @@ sub parse_location {
     $self->{path} = $self->{ar}->uri;
     my $loc = $self->{ar}->location;
     no warnings 'uninitialized';
+    $self->{path} .= '/' if $self->{path} eq $loc;
     $self->{path} =~ s/^($loc)?\///;
     $self->parse_path;
     $self->parse_args;
@@ -47,7 +49,14 @@ sub send_output {
         ? $r->{content_type} . "; charset=" . $r->{document_encoding}
         : $r->{content_type}
     );
-    $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
+    $r->{ar}->headers_out->set(
+        "Content-Length" => do { use bytes; length $r->{output} }
+    );
+    foreach my $header (keys %{$r->{extra_headers}}) {
+	$r->{ar}->headers_out->set(
+	    "$header" => $r->{extra_headers}{$header}
+	);
+    }
     APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );
 }