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

[maypole.git] / lib / CGI / Maypole.pm

diff --git a/lib/CGI/Maypole.pm b/lib/CGI/Maypole.pm
index 88abc3cebf7218ed1f8c419937834ca04c96d5bd..94fd27b3f79458245154e584a4dc4c596cf73176 100644 (file)
--- a/lib/CGI/Maypole.pm
+++ b/lib/CGI/Maypole.pm
@@ -4,6 +4,7 @@ use base 'Maypole';
 use strict;
 use warnings;
 use CGI::Simple;
+use Maypole::Headers;
 
 our $VERSION = '2.05';
 
@@ -16,10 +17,20 @@ sub get_request {
     shift->{cgi} = CGI::Simple->new();
 }
 
+
 sub parse_location {
     my $self = shift;
-    $self->{path} = $self->{cgi}->url( -absolute => 1, -path_info => 1 );
-    my $loc = $self->{cgi}->url( -absolute => 1 );
+    my $cgi = $self->{cgi};
+
+    # Reconstruct the request headers (as far as this is possible)
+    $self->headers_in(Maypole::Headers->new);
+    for my $http_header ($cgi->http) {
+        (my $field_name = $http_header) =~ s/^HTTPS?_//;
+        $self->headers_in->set($field_name => $cgi->http($http_header));
+    }
+
+    $self->{path} = $cgi->url( -absolute => 1, -path_info => 1 );
+    my $loc = $cgi->url( -absolute => 1 );
     no warnings 'uninitialized';
     $self->{path} .= '/' if $self->{path} eq $loc;
     $self->{path} =~ s/^($loc)?\///;
@@ -40,17 +51,19 @@ sub parse_args {
 
 sub send_output {
     my $r = shift;
-    my %processed = map { "-".$_,$r->{extra_headers}{$_} } 
-                   keys %{$r->{extra_headers}};
-    print $r->{cgi}->header(
-        -type           => $r->{content_type},
-        -charset        => $r->{document_encoding},
-        -content_length => do { use bytes; length $r->{output} }, 
-       %processed 
-       ? %processed
-       : {}
+
+    # Collect HTTP headers
+    my %headers = (
+        -type            => $r->{content_type},
+        -charset         => $r->{document_encoding},
+        -content_length  => do { use bytes; length $r->{output} },
     );
-    print $r->{output};
+    foreach ($r->headers_out->header_field_names) {
+        next if /^Content-/;
+        $headers{"-$_"} = $r->headers_out->get($_);
+    }
+
+    print $r->{cgi}->header(%headers), $r->{output};
 }
 
 sub get_template_root {