Back out 13528, cocked that up.

diff --git a/Changes b/Changes
index 36175c6..308a63a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,12 +1,5 @@
 # This file documents the revision history for Perl extension Catalyst.
 
- Bug fixes:
-  - parse_on_demand fixed when used in conjunction with debug mode.
-    A regression was introduced in 5.80022 which would cause the body
-    to always be parsed for logging at the end of the request when in
-    debug mode. This has been fixed so that if the body has not been parsed
-    by the time the request is logged, then the body is omitted.
-
 5.80025 2010-07-29 01:50:00
 
  New features:

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index e310bd8..07a8c16 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -2150,7 +2150,7 @@ sub log_request {
         $c->log->debug("Query keywords are: $keywords");
     }
 
-    $c->log_request_parameters( query => $request->query_parameters, $request->_has_body ? (body => $request->body_parameters) : () );
+    $c->log_request_parameters( query => $request->query_parameters, body => $request->body_parameters );
 
     $c->log_request_uploads($request);
 }

diff --git a/t/aggregate/live_engine_request_env.t b/t/aggregate/live_engine_request_env.t
index 30066a4..a7de8d7 100644 (file)
--- a/t/aggregate/live_engine_request_env.t
+++ b/t/aggregate/live_engine_request_env.t
@@ -17,15 +17,13 @@ BEGIN {
          = "Test env value " . rand(100000);
 }
 
-use Test::More;
+use Test::More tests => 7;
 use Catalyst::Test 'TestApp';
 
 use Catalyst::Request;
 use HTTP::Headers;
 use HTTP::Request::Common;
 
-plan skip_all => 'Does not work in live tests' if ( $ENV{CATALYST_SERVER} );
-
 {
     my $env;
 
@@ -47,5 +45,3 @@ plan skip_all => 'Does not work in live tests' if ( $ENV{CATALYST_SERVER} );
     }
 }
 
-done_testing;
-