Fix bug stopping fastcgi script working

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 3ad1701..2f49384 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -16,7 +16,6 @@ use Catalyst::Utils;
 use Catalyst::Controller;
 use Data::OptList;
 use Devel::InnerPackage ();
-use File::stat;
 use Module::Pluggable::Object ();
 use Text::SimpleTable ();
 use Path::Class::Dir ();
@@ -1872,9 +1871,9 @@ sub finalize_headers {
         # get the length from a filehandle
         if ( blessed( $response->body ) && $response->body->can('read') || ref( $response->body ) eq 'GLOB' )
         {
-            my $stat = stat $response->body;
-            if ( $stat && $stat->size > 0 ) {
-                $response->content_length( $stat->size );
+            my $size = -s $response->body;
+            if ( $size ) {
+                $response->content_length( $size );
             }
             else {
                 $c->log->warn('Serving filehandle without a content-length');
@@ -2600,16 +2599,13 @@ sub engine_class {
 }
 
 sub setup_engine {
-    my ($class, $compat_requested_engine) = @_;
+    my ($class, $requested_engine) = @_;
 
     $class->engine_loader(
         Catalyst::EngineLoader->new({
             application_name => $class,
-            (!defined $compat_requested_engine
-                 ? ()
-                 : (compat_options => {
-                     requested_engine => $compat_requested_engine,
-                 })),
+            (defined $requested_engine
+                 ? (requested_engine => $requested_engine) : ()),
         }),
     );