X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=f3e55251c0bfceb65769d8330f1541f690c4000a;hp=24674b95c50002ed73785f8f79fe98ab7d7d17b9;hb=ef52d28f14574311a08012a742a704c36fd1cc28;hpb=103f2d968b5a1a732c19c39ae03cdd9a44a96a4b

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 24674b9..f3e5525 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -3572,8 +3572,8 @@ sub setup_encoding {
 =head2 handle_unicode_encoding_exception
 
 Hook to let you customize how encoding errors are handled.  By default
-we just throw an exception.  Receives a hashref of debug information.
-Example of call:
+we just throw an exception and the default error page will pick it up.
+Receives a hashref of debug information.  Example of call:
 
     $c->handle_unicode_encoding_exception({
         param_value => $value,
@@ -3598,6 +3598,11 @@ in your application:
       return 1;
     }
 
+<B>NOTE:</b> Please keep in mind that once an error like this occurs, the request
+setup is aborted, which means the state of C<$c> and related context parts like
+the request and response may not be setup up correctly (since we never finished the
+setup.
+
 =cut
 
 sub handle_unicode_encoding_exception {
@@ -3647,7 +3652,7 @@ sub _handle_param_unicode_decoding {
       $enc->decode( $value, $check);
     }
     catch {
-        $self->handle_unicode_encoding_exception({
+        return $self->handle_unicode_encoding_exception({
             param_value => $value,
             error_msg => $_,
             encoding_step => 'params',