]> git.decadent.org.uk Git - maypole.git/commitdiff
projects / maypole.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a4b4916)
fix to redirect request
authorAaron Trevena <aaron.trevena@gmail.com>
Thu, 17 Apr 2008 19:45:57 +0000 (19:45 +0000)
committerAaron Trevena <aaron.trevena@gmail.com>
Thu, 17 Apr 2008 19:45:57 +0000 (19:45 +0000)
git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@584 48953598-375a-da11-a14b-00016c27c3ee

lib/Apache/MVC.pm patch | blob | history
lib/Maypole.pm patch | blob | history

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 3ea2d28479dc28d49430c893ba6b7fc18765b3ae..20046a6606bfde2b37b9804a0264081d329d75de 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -197,8 +197,7 @@ can only be combined with status.
 sub redirect_request {
   my $r = shift;
   my $redirect_url = $_[0];
 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}) {
   if ($_[1]) {
     my %args = @_;
     if ($args{url}) {
@@ -218,6 +217,7 @@ sub redirect_request {
 
   $r->ar->status($status);
   $r->ar->headers_out->set('Location' => $redirect_url);
 
   $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;
 }
 
   return OK;
 }
 
diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index fd39cfa5bff4f467001f662a7cf2bdd645216edd..1a86f53ad515c57afb82fa1d1b381f0abcb10b54 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -616,7 +616,7 @@ my %filetypes = (
 sub __get_mime_type {
   my $self = shift;
   my $type = 'text/html';
 sub __get_mime_type {
   my $self = shift;
   my $type = 'text/html';
-  if ($self->path =~ m/.*\.(\w{3,4})$/) {
+  if ($self->path =~ m/.*\.(\w{2,4})$/) {
     $type = $filetypes{$1};
   } else {
     my $output = $self->output;
     $type = $filetypes{$1};
   } else {
     my $output = $self->output;
Package: Maypole [unmaintained]