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);
}
=cut
-sub redirect_request
-{
+sub redirect_request {
my $r = shift;
my $redirect_url = $_[0];
my $status = $MODPERL2 ? eval 'Apache2::Const::REDIRECT;' :
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});
}
} 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));