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

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 0f91e9a..0ee09fa 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -7,11 +7,13 @@ use warnings;
 
 use base 'Maypole';
 use mod_perl;
+use Maypole::Headers;
 
 use constant APACHE2 => $mod_perl::VERSION >= 1.99;
 
 if (APACHE2) {
     require Apache2;
+    require Apache::RequestIO;
     require Apache::RequestRec;
     require Apache::RequestUtil;
     require APR::URI;
@@ -26,9 +28,20 @@ sub get_request {
 
 sub parse_location {
     my $self = shift;
+
+    # Reconstruct the request headers
+    $self->headers_in(Maypole::Headers->new);
+    my %headers;
+    if (APACHE2) { %headers = %{$self->{ar}->headers_in};
+    } else { %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;
@@ -47,7 +60,15 @@ 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 ($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} );
 }