X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2FApache%2FMVC.pm;h=cd4e96d2fc0550af8a0cdf7d6f007148a284257f;hb=b65ee86d592a4038c2bd7f354a29894145758893;hp=13d8a14517abb18cd15b7b82c171ef45bfe19ebe;hpb=7637da3c79552ce54e8b71b880af799ddfd64eca;p=maypole.git diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm index 13d8a14..cd4e96d 100644 --- a/lib/Apache/MVC.pm +++ b/lib/Apache/MVC.pm @@ -1,6 +1,6 @@ package Apache::MVC; -our $VERSION = '2.04'; +our $VERSION = '2.05'; use strict; use warnings; @@ -12,6 +12,7 @@ use constant APACHE2 => $mod_perl::VERSION >= 1.99; if (APACHE2) { require Apache2; + require Apache::RequestIO; require Apache::RequestRec; require Apache::RequestUtil; require APR::URI; @@ -29,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; @@ -47,7 +49,9 @@ sub send_output { ? $r->{content_type} . "; charset=" . $r->{document_encoding} : $r->{content_type} ); - $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} ); + $r->{ar}->headers_out->set( + "Content-Length" => do { use bytes; length $r->{output} } + ); APACHE2 || $r->{ar}->send_http_header; $r->{ar}->print( $r->{output} ); }