+ Use HTTP::Headers for input/output headers. Add appropriate unit tests.

[maypole.git] / lib / Apache / MVC.pm

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 0921412afbaf1f556d2e86f30a7de82664296433..7dbb2416dfbb53fa29fa616d72eb4143a9b7e093 100644 (file)
--- 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,6 +28,14 @@ sub get_request {
 
 sub parse_location {
     my $self = shift;
+
+    # Reconstruct the request headers
+    $self->headers_in(HTTP::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';
@@ -52,11 +61,12 @@ sub send_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}
-       );
+
+    foreach ($r->headers_out->field_names) {
+        next if /^Content-/;
+        $r->{ar}->headers_out->set($_ => $r->headers_out->get($_));
     }
+
     APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );
 }