From: Simon Cozens <simon@simon-cozens.org>
Date: Wed, 21 Jul 2004 09:23:28 +0000 (+0000)
Subject: Needed for Apache2, apparently.
X-Git-Tag: 2.10~199
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1970b15356f27bd73d99f6d8160088c616cea5cb;p=maypole.git

Needed for Apache2, apparently.


git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@163 48953598-375a-da11-a14b-00016c27c3ee
---

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 6cecb93..b55f7b9 100644
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -4,7 +4,7 @@ use attributes ();
 use UNIVERSAL::require;
 use strict;
 use warnings;
-our $VERSION = "1.5";
+our $VERSION = "1.7";
 __PACKAGE__->mk_classdata($_) for qw( config init_done view_object );
 __PACKAGE__->mk_accessors ( qw( ar params query objects model_class
 args action template ));
@@ -52,10 +52,11 @@ sub handler {
     my $class = shift;
     $class->init unless $class->init_done;
     my $r = bless { config => $class->config }, $class;
-    $r->get_request();
+    $r->get_request(@_);
     $r->parse_location();
     my $status = $r->handler_guts();
     return $status unless $status == OK;
+    $r->{content_type} ||= "text/html";
     $r->send_output;
     return $status;
 }