[Catalyst-commits] r13082 - in Catalyst-Runtime/5.80/trunk: . lib/Catalyst

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-03-26 16:00:54 +0000 (Fri, 26 Mar 2010)
New Revision: 13082

Modified:
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm
Log:
Make sure to construct Upload objects properly, even if there are multiple Content-Type headers.

Closes RT#55976.

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2010-03-24 12:09:21 UTC (rev 13081)
+++ Catalyst-Runtime/5.80/trunk/Changes	2010-03-26 16:00:54 UTC (rev 13082)
@@ -19,6 +19,8 @@
   Bug fixed:
     - DispatchType::Index's uri_for_action only returns for actions registered
       with it (prevents 'index :Path' or similar resolving to the wrong URI)
+    - Make sure to construct Upload objects properly, even if there are
+      multiple Content-Type headers (Closes RT#55976).
 
 5.80021 2010-03-03 23:02:01
 

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm	2010-03-24 12:09:21 UTC (rev 13081)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/Engine.pm	2010-03-26 16:00:54 UTC (rev 13082)
@@ -543,7 +543,7 @@
             my $u = Catalyst::Request::Upload->new
               (
                size => $upload->{size},
-               type => $headers->content_type,
+               type => scalar $headers->content_type,
                headers => $headers,
                tempname => $upload->{tempname},
                filename => $upload->{filename},