X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=203e39449af843943ab904dfb8609adc2afe88f8;hb=fef379e5f473ed4f21f9dc5fa6c36bf46a6b9729;hp=4fcd8dfde15de7eab8fac55ea4905ae219470ccb;hpb=6f3e2ec142b6dd83d7d4960cf15acd6ca8b73e1d;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 4fcd8df..203e394 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -1,5 +1,7 @@
 package Apache::MVC;
 
+our $VERSION = '2.03';
+
 use strict;
 use warnings;
 
@@ -17,8 +19,6 @@ if (APACHE2) {
 else { require Apache }
 require Apache::Request;
 
-our $VERSION = "0.4";
-
 sub get_request {
     my ( $self, $r ) = @_;
     $self->{ar} = Apache::Request->new($r);
@@ -30,7 +30,6 @@ sub parse_location {
     my $loc = $self->{ar}->location;
     no warnings 'uninitialized';
     $self->{path} =~ s/^($loc)?\///;
-    $self->rewrite_path;
     $self->parse_path;
     $self->parse_args;
 }
@@ -44,7 +43,9 @@ sub parse_args {
 sub send_output {
     my $r = shift;
     $r->{ar}->content_type(
-        $r->{content_type} . "; encoding=" . $r->{document_encoding} );
+        $r->{content_type}  =~ m/^text/ ?
+	$r->{content_type} . "; charset=" . $r->{document_encoding} :
+	$r->{content_type} );
     $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
     APACHE2 || $r->{ar}->send_http_header;
     $r->{ar}->print( $r->{output} );
@@ -154,6 +155,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>