Fix ->engine->env for the second time. I shouldn't have trusted the author of Catalys...

diff --git a/Changes b/Changes
index 3d340cd..95d51c4 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+        - Further change pushing 'env' attribute down into Catalyst::Engine
+          to make $c->engine->env work in all cases (kmx)
         - Clarify correct techniques for Moose controllers (domm)
         - Add $c->req->remote_user to disambiguate from $c->req->user (dwc)
 

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 8d66546..1fdbaad 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -13,6 +13,8 @@ use URI::QueryParam;
 
 use namespace::clean -except => 'meta';
 
+has env => (is => 'rw');
+
 # input position and length
 has read_length => (is => 'rw');
 has read_position => (is => 'rw');

diff --git a/lib/Catalyst/Engine/CGI.pm b/lib/Catalyst/Engine/CGI.pm
index 17a6e6c..4e3686f 100644 (file)
--- a/lib/Catalyst/Engine/CGI.pm
+++ b/lib/Catalyst/Engine/CGI.pm
@@ -3,7 +3,6 @@ package Catalyst::Engine::CGI;
 use Moose;
 extends 'Catalyst::Engine';
 
-has env => (is => 'rw');
 has _header_buf => (is => 'rw', clearer => '_clear_header_buf', predicate => '_has_header_buf');
 
 =head1 NAME