fixed small hash order bug in MIME type prioritization

mojolicious · Dec 14, 2012 · 0c38458 · 0c38458
1 parent 75b17c6
commit 0c38458
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/Mojolicious/Types.pm b/lib/Mojolicious/Types.pm
@@ -37,11 +37,10 @@ sub detect {
 
   # Extract and prioritize MIME types
   my %types;
-  for my $type (split /,/, $accept // '') {
-    next unless $type =~ /^\s*([^,; ]+)(?:\s*\;\s*q=([\d.]+))?\s*$/i;
-    $types{lc $1} = $2 // 1;
-  }
-  my @types = sort { $types{$b} <=> $types{$a} } keys %types;
+  /^\s*([^,; ]+)(?:\s*\;\s*q=(\d+(?:\.\d+)?))?\s*$/i
+    and $types{lc $1} = $2 // 1
+    for split /,/, $accept // '';
+  my @types = sort { $types{$b} <=> $types{$a} } sort keys %types;
   return [] if !$prioritize && @types > 1;
 
   # Detect extensions from MIME types

diff --git a/t/mojolicious/types.t b/t/mojolicious/types.t
@@ -68,6 +68,8 @@ is $t->type('html'), 'text/html;charset=UTF-8', 'right type';
 
 # Prioritize
 is_deeply $t->detect('text/plain', 1), ['txt'], 'right formats';
+is_deeply $t->detect('text/plain,text/html', 1), ['htm', 'html', 'txt'],
+  'right formats';
 is_deeply $t->detect('TEXT/HTML; q=0.8 ', 1), ['htm', 'html'], 'right formats';
 is_deeply $t->detect('TEXT/HTML;Q=0.8,text/plain;Q=0.9', 1),
   ['txt', 'htm', 'html'], 'right formats';