X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=ba8568ae8441169c734dd099afa6c65316f606db;hb=14d2fa6a7c8d5033bcec01095abe5f95610e91db;hp=017b2d4d84af78d54dc1f55135dad5281704216f;hpb=e27f66333648124b2e0df77419f8014fd1d98df4;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 017b2d4..ba8568a 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -22,19 +22,6 @@ use namespace::clean -except => 'meta';
 # Amount of data to read from input on each pass
 our $CHUNKSIZE = 64 * 1024;
 
-# XXX - this is only here for compat, do not use!
-has env => ( is => 'rw', writer => '_set_env' );
-my $WARN_ABOUT_ENV = 0;
-around env => sub {
-  my ($orig, $self, @args) = @_;
-  if(@args) {
-    warn "env as a writer is deprecated, you probably need to upgrade Catalyst::Engine::PSGI"
-      unless $WARN_ABOUT_ENV++;
-    return $self->_set_env(@args);
-  }
-  return $self->$orig;
-};
-
 # XXX - Only here for Engine::PSGI compat
 sub prepare_connection {
     my ($self, $ctx) = @_;
@@ -209,8 +196,7 @@ sub finalize_cookies {
             )
         );
         if (!defined $cookie) {
-            $c->log->warn("undef passed in '$name' cookie value - not setting cookie")
-                if $c->debug;
+            $c->trace(1, "undef passed in '$name' cookie value - not setting cookie");
             next;
         }
 
@@ -263,6 +249,8 @@ sub finalize_error {
     }
 
     my ( $title, $error, $infos );
+    ## For now we keep debug mode for turning on the default
+    ## debugging error screen - jnap.
     if ( $c->debug ) {
 
         # For pretty dumps
@@ -653,7 +641,6 @@ sub prepare_request {
     my ($self, $ctx, %args) = @_;
     $ctx->log->psgienv($args{env}) if $ctx->log->can('psgienv');
     $ctx->request->_set_env($args{env});
-    $self->_set_env($args{env}); # Nasty back compat!
     $ctx->response->_set_response_cb($args{response_cb});
 }