Merge branch 'ancona' into ancona-trace

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 3580373..c5f9f78 100755 (executable)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2199,9 +2199,7 @@ Prepares connection.
 
 sub prepare_connection {
     my $c = shift;
-    # XXX - This is called on the engine (not the request) to maintain
-    #       Engine::PSGI back compat.
-    $c->engine->prepare_connection($c);
+    $c->request->prepare_connection($c);
 }
 
 =head2 $c->prepare_cookies

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index ba8568a..2aa6b11 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -22,12 +22,6 @@ use namespace::clean -except => 'meta';
 # Amount of data to read from input on each pass
 our $CHUNKSIZE = 64 * 1024;
 
-# XXX - Only here for Engine::PSGI compat
-sub prepare_connection {
-    my ($self, $ctx) = @_;
-    $ctx->request->prepare_connection;
-}
-
 =head1 NAME
 
 Catalyst::Engine - The Catalyst Engine