misc fixes for header support (see list)

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

diff --git a/lib/CGI/Maypole.pm b/lib/CGI/Maypole.pm
index 923316329c9ace54d5933314c2dd70bb566d2832..793d47fb1d5c3ea1032841719281e05afc35fb4e 100644 (file)
--- a/lib/CGI/Maypole.pm
+++ b/lib/CGI/Maypole.pm
@@ -3,6 +3,8 @@ use base 'Maypole';
 
 use strict;
 use warnings;
+use CGI::Simple;
+use Maypole::Headers;
 
 our $VERSION = '2.05';
 
@@ -12,17 +14,26 @@ sub run {
 }
 
 sub get_request {
-    require CGI::Simple;
     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} =~ s/^($loc)?\///;
     $self->{path} .= '/' if $self->{path} eq $loc;
+    $self->{path} =~ s/^($loc)?\///;
     $self->parse_path;
     $self->parse_args;
 }
@@ -40,12 +51,19 @@ sub parse_args {
 
 sub send_output {
     my $r = shift;
-    print $r->{cgi}->header(
-        -type           => $r->{content_type},
-        -charset        => $r->{document_encoding},
-        -content_length => do { use bytes; length $r->{output} }, 
+
+    # 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-(Type|Length)/;
+        $headers{"-$_"} = $r->headers_out->get($_);
+    }
+
+    print $r->{cgi}->header(%headers), $r->{output};
 }
 
 sub get_template_root {