processing image/* is an odditity because there is

a test case which expects image/* to not to be
expanded. So I am leaving image/* as it is and
process only text/* and application/*

2 files changed, 1 insertions, 7 deletions

diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index 2b8395fc09..5ea49a23c7 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -81,7 +81,7 @@ module Mime
 
     class << self
 
-      TRAILING_STAR_REGEXP = /(\w+)\/\*/
+      TRAILING_STAR_REGEXP = /(text|application)\/\*/
 
       def lookup(string)
         LOOKUP[string]
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index bf44cb95fa..25e106f519 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -45,12 +45,6 @@ class MimeTypeTest < ActiveSupport::TestCase
     assert_equal expect, parsed.sort_by(&:to_s)
   end
 
-  test "parse image with trailing star" do
-    accept = "image/*"
-    parsed = Mime::Type.parse(accept)
-    assert parsed.include?(Mime::PNG)
-  end
-
   test "parse without q" do
     accept = "text/xml,application/xhtml+xml,text/yaml,application/xml,text/html,image/png,text/plain,application/pdf,*/*"
     expect = [Mime::HTML, Mime::XML, Mime::YAML, Mime::PNG, Mime::TEXT, Mime::PDF, Mime::ALL]