From: Tomas Doran <bobtfish@bobtfish.net>
Date: Wed, 25 Aug 2010 13:46:22 +0000 (+0000)
Subject: Fix bug with parse_on_demand
X-Git-Tag: 5.80026~7^2~11
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=6e3f9d973268bf6e117dcb0a5d775de61e22c418

Fix bug with parse_on_demand
---

diff --git a/Changes b/Changes
index 308a63a..36175c6 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,12 @@
 # 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 07a8c16..e310bd8 100644
--- 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, body => $request->body_parameters );
+    $c->log_request_parameters( query => $request->query_parameters, $request->_has_body ? (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 a7de8d7..30066a4 100644
--- a/t/aggregate/live_engine_request_env.t
+++ b/t/aggregate/live_engine_request_env.t
@@ -17,13 +17,15 @@ BEGIN {
          = "Test env value " . rand(100000);
 }
 
-use Test::More tests => 7;
+use Test::More;
 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;
 
@@ -45,3 +47,5 @@ use HTTP::Request::Common;
     }
 }
 
+done_testing;
+