merged in TEEJAY Changes with current head

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

diff --git a/lib/CGI/Maypole.pm b/lib/CGI/Maypole.pm
index 39514f97cb763550eb03f46451fcaaaeb36a4597..bb6de3f79a1b892cadf91a58159884aaf8ea4107 100644 (file)
--- a/lib/CGI/Maypole.pm
+++ b/lib/CGI/Maypole.pm
@@ -3,8 +3,11 @@ use base 'Maypole';
 
 use strict;
 use warnings;
+use CGI::Simple;
+use Maypole::Headers;
+use Maypole::Constants;
 
-our $VERSION = '2.05';
+our $VERSION = '2.10';
 
 sub run {
     my $self = shift;
@@ -12,14 +15,28 @@ sub run {
 }
 
 sub get_request {
-    require CGI::Simple;
     shift->{cgi} = CGI::Simple->new();
 }
 
+sub get_protocol {
+  my $self = shift;
+  my $protocol = ($self->{cgi}->https()) ? 'https' : 'http';
+  return $protocol;
+}
+
 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)?\///;
@@ -38,14 +55,47 @@ sub parse_args {
     $self->{query}  = {%vars};
 }
 
+# FIXME: use headers_in to gather host and other information?
+sub redirect_request {
+  my $self = shift;
+  my $redirect_url = $_[0];
+  my $status = "302";
+  if ($_[1]) {
+    my %args = @_;
+    if ($args{url}) {
+      $redirect_url = $args{url};
+    } else {
+      my $path = $args{path} || $self->{cgi}->url(-absolute => 1, -query=>1);
+      my $host = $args{domain};
+      ($host = $self->{cgi}->url(-base => 1)) =~ s/^https?:\/\///i unless ($host);
+      my $protocol = $args{protocol} || ($self->{cgi}->https()) ? 'https' : 'http';
+      $redirect_url = "${protocol}://${host}/${path}";
+    }
+    $status = $args{status} if ($args{status});
+  }
+
+  $self->headers_out->set('Status' => $status);
+  $self->headers_out->set('Location' => $redirect_url);
+
+  return;
+}
+
+
 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->field_names) {
+        next if /^Content-(Type|Length)/;
+        $headers{"-$_"} = $r->headers_out->get($_);
+    }
+
+    print $r->{cgi}->header(%headers), $r->{output};
 }
 
 sub get_template_root {
@@ -83,10 +133,15 @@ CGI::Maypole - CGI-based front-end to Maypole
 Now to access the beer database, type this URL into your browser:
 http://your.site/cgi-bin/beer.cgi/frontpage
 
+NOTE: this Maypole frontend requires additional modules that won't be installed or included with Maypole. Please see below.
+
 =head1 DESCRIPTION
 
-This is a handler for Maypole which will use the CGI instead of Apache's
-C<mod_perl> 1.x. This handler can also be used for Apache 2.0.
+This is a CGI platform driver for Maypole. Your application can inherit from
+CGI::Maypole directly, but it is recommended that you use
+L<Maypole::Application>.
+
+This module requires CGI::Simple which you will have to install yourself via CPAN or manually.
 
 =head1 METHODS
 
@@ -100,7 +155,7 @@ Call this from your CGI script to start the Maypole application.
 
 =head1 Implementation
 
-This class overrides a set of methods in the base Maypole class to provide it's 
+This class overrides a set of methods in the base Maypole class to provide it's
 functionality. See L<Maypole> for these:
 
 =over
@@ -117,8 +172,14 @@ functionality. See L<Maypole> for these:
 
 =back
 
+=head1 DEPENDANCIES
+
+CGI::Simple
+
 =head1 AUTHORS
 
 Dave Ranney C<dave@sialia.com>
 
 Simon Cozens C<simon@cpan.org>
+
+=cut