sub get_request {
my ($self, $r) = @_;
- my $ar = ($MODPERL2) ? $r : Apache::Request->instance($r);
+ my $ar;
+ if ($MODPERL2) {
+ $ar = eval {require Apache2::Request} ? Apache2::Request->new($r) : $r;
+ }
+ else { $ar = Apache::Request->instance($r); }
$self->ar($ar);
}
+=item warn
+
+=cut
+
+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 ) {
+ $ar->warn("[$package line $line] ", @args) ;
+ } else {
+ print "warn called by ", caller, " with ", @_, "\n";
+ }
+ return;
+}
+
+
=item parse_location
=cut
for (keys %headers) {
$self->headers_in->set($_, $headers{$_});
}
+
my $path = $self->ar->uri;
- my $loc = $self->ar->location;
+ my $base = URI->new($self->config->uri_base);
+ my $loc = $base->path;
+
{
no warnings 'uninitialized';
$path .= '/' if $path eq $loc;
- $path =~ s/^($loc)?\///;
+ if ($loc =~ /\/$/) {
+ $path =~ s/^($loc)?//;
+ } else {
+ $path =~ s/^($loc)?\///;
+ }
}
+
$self->path($path);
$self->parse_path;
$self->parse_args;
=item redirect_request
+Sets output headers to redirect based on the arguments provided
+
+Accepts either a single argument of the full url to redirect to, or a hash of
+named parameters :
+
+$r->redirect_request('http://www.example.com/path');
+
+or
+
+$r->redirect_request(protocol=>'https', domain=>'www.example.com', path=>'/path/file?arguments', status=>'302', url=>'..');
+
+The named parameters are protocol, domain, path, status and url
+
+Only 1 named parameter is required but other than url, they can be combined as
+required and current values (from the request) will be used in place of any
+missing arguments. The url argument must be a full url including protocol and
+can only be combined with status.
+
=cut
sub redirect_request
} else {
my $body = $self->_prepare_body($apr);
%args = %{$body->param};
- my $uri = URI->new($self->ar->uri);
+ my $uri = URI->new($self->ar->unparsed_uri);
foreach my $key ($uri->query_param) {
if (ref $args{$key}) {
push (@{$args{$key}}, $uri->query_param($key));