package Apache::MVC;
-our $VERSION = '2.11';
+our $VERSION = '2.121';
use strict;
use warnings;
sub get_request {
my ($self, $r) = @_;
+ my $request_options = $self->config->request_options || {};
my $ar;
if ($MODPERL2) {
- $ar = eval {require Apache2::Request} ? Apache2::Request->new($r) : $r;
- }
- else { $ar = Apache::Request->instance($r); }
+ $ar = eval {require Apache2::Request} ? Apache2::Request->new($r,%{$request_options}) : $r;
+ } else {
+ if (keys %$request_options) {
+ $ar = Apache::Request->new($r,%{$request_options});
+ } else {
+ $ar = Apache::Request->instance($r);
+ }
+ }
$self->ar($ar);
}
sub warn {
my ($self,@args) = @_;
my ($package, $line) = (caller)[0,2];
+ my $ar = $self->parent ? $self->parent->{ar} : $self->{ar};
if ( $args[0] and ref $self ) {
- $self->{ar}->warn("[$package line $line] ", @args) ;
+ $ar->warn("[$package line $line] ", @args) ;
} else {
print "warn called by ", caller, " with ", @_, "\n";
}
# Reconstruct the request headers
$self->headers_in(Maypole::Headers->new);
+
my %headers;
if ($MODPERL2) { %headers = %{$self->ar->headers_in};
} else { %headers = $self->ar->headers_in; }
$self->headers_in->set($_, $headers{$_});
}
+ $self->preprocess_location();
+
my $path = $self->ar->uri;
my $base = URI->new($self->config->uri_base);
my $loc = $base->path;
=cut
-sub redirect_request
-{
+sub redirect_request {
my $r = shift;
my $redirect_url = $_[0];
- my $status = $MODPERL2 ? eval 'Apache2::Const::REDIRECT;' :
- eval 'Apache::Constants::REDIRECT;'; # why have to eval this?
+ my $status = $MODPERL2 ? eval 'Apache2::Const::REDIRECT;' : eval 'Apache::Constants::REDIRECT;';
if ($_[1]) {
my %args = @_;
if ($args{url}) {
my $path = $args{path} || $r->path;
my $host = $args{domain} || $r->ar->hostname;
my $protocol = $args{protocol} || $r->get_protocol;
- $redirect_url = "${protocol}://${host}/${path}";
+
+ $redirect_url = URI->new;
+ $redirect_url->scheme($protocol);
+ $redirect_url->host($host);
+ $redirect_url->path($path);
}
$status = $args{status} if ($args{status});
}
$r->ar->status($status);
$r->ar->headers_out->set('Location' => $redirect_url);
+ $r->output('<html><head><title>redirecting...</title></head><body><h2>redirecting..</h2></body></html>') unless ($r->output);
return OK;
}
+
=item get_protocol
=cut