X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=ba0fec0ad01fcf09da1348a24a10e33096220d6a;hb=b91bc53de6872ec4b22779382f6955b3af7c6fd5;hp=e14e40e266a9fccca0896085b4f9b6155727f694;hpb=3a445aceb3bef919c41c0912b13de492d4b315ec;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index e14e40e..ba0fec0 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -7,6 +7,7 @@ use warnings;
 
 use base 'Maypole';
 use mod_perl;
+use Maypole::Headers;
 
 use constant APACHE2 => $mod_perl::VERSION >= 1.99;
 
@@ -27,9 +28,18 @@ sub get_request {
 
 sub parse_location {
     my $self = shift;
+
+    # Reconstruct the request headers
+    $self->headers_in(Maypole::Headers->new);
+    my %headers = $self->{ar}->headers_in;
+    for (keys %headers) {
+        $self->headers_in->set($_, $headers{$_});
+    }
+
     $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;
@@ -51,6 +61,12 @@ sub send_output {
     $r->{ar}->headers_out->set(
         "Content-Length" => do { use bytes; length $r->{output} }
     );
+
+    foreach ($r->headers_out->field_names) {
+        next if /^Content-(Type|Length)/;
+        $r->{ar}->headers_out->set($_ => $r->headers_out->get($_));
+    }
+
     APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );
 }