redirecting...

X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=20046a6606bfde2b37b9804a0264081d329d75de;hb=ed2bc6057ed94ae64e5b03ff28477fcbac52f4ee;hp=696ab84847a75987f1ce785728f1ae1eecce673c;hpb=8bee7ab27f76f2b3e8a65113ded4d439ec4949fe;p=maypole.git diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm index 696ab84..20046a6 100644 --- a/lib/Apache/MVC.pm +++ b/lib/Apache/MVC.pm @@ -1,6 +1,6 @@ package Apache::MVC; -our $VERSION = '2.11'; +our $VERSION = '2.121'; use strict; use warnings; @@ -93,11 +93,17 @@ functionality. See L for these: 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); } @@ -127,6 +133,7 @@ sub parse_location { # 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; } @@ -134,6 +141,8 @@ sub parse_location { $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; @@ -188,8 +197,7 @@ can only be combined with status. 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}) { @@ -209,6 +217,7 @@ sub redirect_request { $r->ar->status($status); $r->ar->headers_out->set('Location' => $redirect_url); + $r->output('redirecting...

redirecting..

') unless ($r->output) return OK; }