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

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 7dbb241..0ee09fa 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -30,8 +30,10 @@ sub parse_location {
     my $self = shift;
 
     # Reconstruct the request headers
-    $self->headers_in(HTTP::Headers->new);
-    my %headers = $self->{ar}->headers_in;
+    $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{$_});
     }
@@ -63,7 +65,7 @@ sub send_output {
     );
 
     foreach ($r->headers_out->field_names) {
-        next if /^Content-/;
+        next if /^Content-(Type|Length)/;
         $r->{ar}->headers_out->set($_ => $r->headers_out->get($_));
     }