Load middlewares where they're actually used

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index e5e43ea..972b390 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -34,6 +34,8 @@ use Catalyst::EngineLoader;
 use utf8;
 use Carp qw/croak carp shortmess/;
 use Try::Tiny;
+use Plack::Middleware::Conditional;
+use Plack::Middleware::ReverseProxy;
 
 BEGIN { require 5.008004; }
 

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 56486f6..23df093 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -12,8 +12,6 @@ use HTTP::Headers;
 use URI::QueryParam;
 use Moose::Util::TypeConstraints;
 use Plack::Loader;
-use Plack::Middleware::Conditional;
-use Plack::Middleware::ReverseProxy;
 use Catalyst::EngineLoader;
 use Encode ();
 use utf8;