From: John Napiorkowski <jjnapiork@cpan.org>
Date: Sat, 28 Jun 2014 13:46:05 +0000 (-0400)
Subject: Merge branch 'ancona' into ancona-trace
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=d2c88741623b277f5420ae2fe75b8a830a4902ee;hp=14d2fa6a7c8d5033bcec01095abe5f95610e91db

Merge branch 'ancona' into ancona-trace
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 3580373..c5f9f78 100755
--- 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
--- 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