Changeset 5915 for trunk/ModPerlEngineContrib/lib/Foswiki/Engine/Apache.pm

Timestamp:

01/03/10 13:12:10 (2 years ago)

Author:

GilmarSantosJr

Message:

Item2549: preserve REDIRECT_STATUS, so custom error messages work as exected

File:

• trunk/ModPerlEngineContrib/lib/Foswiki/Engine/Apache.pm (modified) (3 diffs)

trunk/ModPerlEngineContrib/lib/Foswiki/Engine/Apache.pm

@@ -78 +78 @@
 use Foswiki::Response        ();
 use File::Spec               ();
+use Assert;
 
 sub run {
@@ -209 +210 @@
     my ( $this, $res, $req ) = @_;
     $this->SUPER::finalizeHeaders( $res, $req );
-    my ($status) = ( $res->status || "200" ) =~ /^(\d\d\d)/o;
-
-    $this->{r}->status( $res->status || 200 );
+
+    # If REDIRECT_STATUS is present, preserve it. See Foswikitask:Item2549
+    # and http://httpd.apache.org/docs/2.2/en/custom-error.html#custom
+    my $status;
+    if (defined $ENV{REDIRECT_STATUS}) {
+        $status = $ENV{REDIRECT_STATUS};
+    }
+    elsif (defined $res->status && $res->status =~ /^\s*(\d{3})/o) {
+        $status = $1;
+    }
+    else {
+        $status = 200;
+    }
+    $this->{r}->status($status);
+
     while ( my ( $header, $value ) = each %{ $res->headers } ) {
         if ( lc($header) eq 'content-type' ) {
@@ -229 +242 @@
             }
         }
-        else {
+        elsif ( lc($header) ne 'status' ) {
             foreach ( ref($value) eq 'ARRAY' ? @$value : ($value) ) {
                 $this->{r}->headers_out->add( $header => $_ );