package Apache::MVC;
+our $VERSION = '2.05';
+
use strict;
use warnings;
use base 'Maypole';
use mod_perl;
+use Maypole::Headers;
use constant APACHE2 => $mod_perl::VERSION >= 1.99;
if (APACHE2) {
require Apache2;
+ require Apache::RequestIO;
require Apache::RequestRec;
require Apache::RequestUtil;
require APR::URI;
else { require Apache }
require Apache::Request;
-our $VERSION = "2.03";
-
sub get_request {
my ( $self, $r ) = @_;
$self->{ar} = Apache::Request->new($r);
sub parse_location {
my $self = shift;
+
+ # Reconstruct the request headers
+ $self->headers_in(Maypole::Headers->new);
+ my %headers;
+ if (APACHE2) { %headers = %{$self->{ar}->headers_in};
+ } else { %headers = $self->{ar}->headers_in; }
+ for (keys %headers) {
+ $self->headers_in->set($_, $headers{$_});
+ }
+
$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;
sub send_output {
my $r = shift;
$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" => length $r->{output} );
+ $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 ($r->headers_out->field_names) {
+ next if /^Content-(Type|Length)/;
+ $r->{ar}->headers_out->set($_ => $r->headers_out->get($_));
+ }
+
APACHE2 || $r->{ar}->send_http_header;
$r->{ar}->print( $r->{output} );
}