X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FApache%2FMVC.pm;h=6f85d6e170145dfd200333e9d5cfd6677ee6f99a;hb=dd1b398a6d2ba788021fafdb7d385e0dae1b0b50;hp=d5909bf897daabe7fafc60ad3daab36ae555b5d4;hpb=14afca2d074d51d7b8fd5306b39e24e06c3a517a;p=maypole.git

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index d5909bf..6f85d6e 100644
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -108,8 +108,9 @@ sub get_request {
 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";
   }
@@ -134,7 +135,8 @@ sub parse_location {
     }
 
     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';
@@ -163,6 +165,24 @@ sub 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