Correctly handle single media with q value. Fixes #736.

rails · Feb 7, 2012 · 3b203f7 · 3b203f7
1 parent 339c99b
commit 3b203f7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -82,6 +82,7 @@ def ==(item)
     class << self
 
       TRAILING_STAR_REGEXP = /(text|application)\/\*/
+      Q_SEPARATOR_REGEXP = /;\s*q=/
 
       def lookup(string)
         LOOKUP[string]
@@ -108,6 +109,7 @@ def register(string, symbol, mime_type_synonyms = [], extension_synonyms = [], s
 
       def parse(accept_header)
         if accept_header !~ /,/
+          accept_header = accept_header.split(Q_SEPARATOR_REGEXP).first
           if accept_header =~ TRAILING_STAR_REGEXP
             parse_data_with_trailing_star($1)
           else
@@ -117,7 +119,7 @@ def parse(accept_header)
           # keep track of creation order to keep the subsequent sort stable
           list, index = [], 0
           accept_header.split(/,/).each do |header|
-            params, q = header.split(/;\s*q=/)
+            params, q = header.split(Q_SEPARATOR_REGEXP)
             if params.present?
               params.strip!