X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=0921412afbaf1f556d2e86f30a7de82664296433;hb=271fd90b8a1b9f843853601a75a1334407ff87c4;hp=320b6b78252227139477c9c6e1ffc15e6f40c9c7;hpb=5c199c0e9cd05a00bfc04d9688982979a41f3ee8;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 320b6b7..0921412 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -1,13 +1,18 @@
 package Apache::MVC;
 
+our $VERSION = '2.05';
+
 use strict;
 use warnings;
 
 use base 'Maypole';
 use mod_perl;
 
-if ( $mod_perl::VERSION >= 1.99 ) {
+use constant APACHE2 => $mod_perl::VERSION >= 1.99;
+
+if (APACHE2) {
     require Apache2;
+    require Apache::RequestIO;
     require Apache::RequestRec;
     require Apache::RequestUtil;
     require APR::URI;
@@ -15,8 +20,6 @@ if ( $mod_perl::VERSION >= 1.99 ) {
 else { require Apache }
 require Apache::Request;
 
-our $VERSION = "0.4";
-
 sub get_request {
     my ( $self, $r ) = @_;
     $self->{ar} = Apache::Request->new($r);
@@ -27,6 +30,7 @@ sub parse_location {
     $self->{path} = $self->{ar}->uri;
     my $loc = $self->{ar}->location;
     no warnings 'uninitialized';
+    $self->{path} .= '/' if $self->{path} eq $loc;
     $self->{path} =~ s/^($loc)?\///;
     $self->parse_path;
     $self->parse_args;
@@ -40,9 +44,20 @@ sub parse_args {
 
 sub send_output {
     my $r = shift;
-    $r->{ar}->content_type( $r->{content_type} );
-    $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
-    $r->{ar}->send_http_header;
+    $r->{ar}->content_type(
+          $r->{content_type} =~ m/^text/
+        ? $r->{content_type} . "; charset=" . $r->{document_encoding}
+        : $r->{content_type}
+    );
+    $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}
+	);
+    }
+    APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );
 }
 
@@ -72,8 +87,8 @@ Apache::MVC - Apache front-end to Maypole
     package BeerDB;
     use base 'Apache::MVC';
     BeerDB->setup("dbi:mysql:beerdb");
-    BeerDB->config->{uri_base} = "http://your.site/";
-    BeerDB->config->{display_tables} = [qw[beer brewery pub style]];
+    BeerDB->config->uri_base("http://your.site/");
+    BeerDB->config->display_tables([qw[beer brewery pub style]]);
     # Now set up your database:
     # has-a relationships
     # untaint columns
@@ -150,6 +165,25 @@ C<delete> commands; for instance, a list of breweries, go to
 For more information about how the system works and how to extend it,
 see L<Maypole>.
 
+=head1 Implementation
+
+This class overrides a set of methods in the base Maypole class to provide it's
+functionality. See L<Maypole> for these:
+
+=over
+
+=item get_request
+
+=item get_template_root
+
+=item parse_args
+
+=item parse_location
+
+=item send_output
+
+=back
+
 =head1 AUTHOR
 
 Simon Cozens, C<simon@cpan.org>