X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=af9f2b28f662ba18b4abb62702ca0d46ae4a9087;hb=f21993513cc09ce7aec7b551bec107dd192d5905;hp=23a1d3f35400f533023c98c46961eeef347c89d4;hpb=eefb8bd16476a347ff5dc3a5abd188e5a5a520a4;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 23a1d3f..af9f2b2 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -46,8 +46,8 @@ has _response_cb => (
 );
 
 subtype 'Catalyst::Engine::Types::Writer',
-    as duck_type([qw(write close)]),
-    where { 1 };
+    as duck_type([qw(write close)]);
+
 has _writer => (
     is      => 'ro',
     isa     => 'Catalyst::Engine::Types::Writer',
@@ -678,7 +678,7 @@ sub prepare_read {
 
 =head2 $self->prepare_request(@arguments)
 
-Populate the context object from the request object.
+Sets up the PSGI environment in the Engine (just for back compat).
 
 =cut
 
@@ -833,13 +833,13 @@ sub run {
         # instead the $app->handle method is called per request.
         $app->log->warn("Not supplied a Plack engine, falling back to engine auto-loader (are your scripts ancient?)")
     }
+    $app->run_options($options);
     $server->run($psgi, $options);
 }
 
 =head2 build_psgi_app ($app, @args)
 
-Builds and returns a PSGI application closure, wrapping it in the reverse proxy
-middleware if the using_frontend_proxy config setting is set.
+Builds and returns a PSGI application closure. (Raw, not wrapped in middleware)
 
 =cut