Merge branch 'master' into holland

Conflicts:
	Changes
	lib/Catalyst.pm
	lib/Catalyst/Runtime.pm

diff --git a/Changes b/Changes
index 2a7af00..8ec2973 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 # This file documents the revision history for Perl extension Catalyst.
 
+TDB
+  - Merged from Stable (5.90079)
+  - reviewed and cleaned up UTF8 related docs
+  - replace missing utf8 pragma in Catalyst::Engine
+
 5.90079.06  - 2015-01-02
   - Removed unneeded depdency on RenderView in new test case that was causing fails
     on CPAN testers that did not just happen to have that dependency already installed
@@ -80,6 +85,11 @@
     scheme for the generated URI object instead of just using whatever the incoming
     request uses.
 
+5.90079 - 2015-01-02
+  - Removed dependency from test case that we don't install for testing (
+    rt #101243)
+  - updated year in copyright notices
+
 5.90078 - 2014-12-30
   - POD corrections (sergey++)
   - New configuration option to disable the HTTP Exception passthru feature

diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 948f28f..34e48c3 100644 (file)
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -14,6 +14,7 @@ use Encode 2.21 'decode_utf8';
 use Plack::Request::Upload;
 use Hash::MultiValue;
 use namespace::clean -except => 'meta';
+use utf8;
 
 # Amount of data to read from input on each pass
 our $CHUNKSIZE = 64 * 1024;