X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=c175d1a059302fb17727ff7aebc8beab90f11577;hb=5f530b5f17106319faa2f437a567332c86bf6a2c;hp=320b6b78252227139477c9c6e1ffc15e6f40c9c7;hpb=5c199c0e9cd05a00bfc04d9688982979a41f3ee8;p=maypole.git diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm index 320b6b7..c175d1a 100644 --- a/lib/Apache/MVC.pm +++ b/lib/Apache/MVC.pm @@ -6,7 +6,9 @@ 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::RequestRec; require Apache::RequestUtil; @@ -42,7 +44,7 @@ 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; + APACHE2 || $r->{ar}->send_http_header; $r->{ar}->print( $r->{output} ); } @@ -72,8 +74,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