[Catalyst-commits] r10221 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst lib/Catalyst/Engine

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-05-21 15:11:42 +0000 (Thu, 21 May 2009)
New Revision: 10221

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm
Log:
Fix ->engine->env for the second time. I shouldn't have trusted the author of Catalyst::Plugin::ENV when he told me it was fixed first time, <sigh>

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2009-05-21 14:08:36 UTC (rev 10220)
+++ Catalyst-Runtime/5.80/trunk/Changes	2009-05-21 15:11:42 UTC (rev 10221)
@@ -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)
 

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm	2009-05-21 14:08:36 UTC (rev 10220)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine/CGI.pm	2009-05-21 15:11:42 UTC (rev 10221)
@@ -3,7 +3,6 @@
 use Moose;
 extends 'Catalyst::Engine';
 
-has env => (is => 'rw');
 has _header_buf => (is => 'rw', clearer => '_clear_header_buf', predicate => '_has_header_buf');
 
 =head1 NAME

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm	2009-05-21 14:08:36 UTC (rev 10220)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm	2009-05-21 15:11:42 UTC (rev 10221)
@@ -13,6 +13,8 @@
 
 use namespace::clean -except => 'meta';
 
+has env => (is => 'rw');
+
 # input position and length
 has read_length => (is => 'rw');
 has read_position => (is => 'rw');