Permalink
Browse files

Merge pull request #5073 from asanghi/4918_backport

Backporting #4918 with one added test for googlebot accept header as I saw it
  • Loading branch information...
2 parents a1b9acb + dffd85a commit 45503ecbb998a317a266e66cf8c55bfe55951719 @josevalim josevalim committed Feb 17, 2012
Showing with 15 additions and 1 deletion.
  1. +3 −1 actionpack/lib/action_dispatch/http/mime_type.rb
  2. +12 −0 actionpack/test/dispatch/mime_type_test.rb
View
4 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!
View
12 actionpack/test/dispatch/mime_type_test.rb
@@ -69,6 +69,18 @@ class MimeTypeTest < ActiveSupport::TestCase
assert_equal expect, Mime::Type.parse(accept)
end
+ test "parse single media range with q" do
+ accept = "text/html;q=0.9"
+ expect = [Mime::HTML]
+ assert_equal expect, Mime::Type.parse(accept)
+ end
+
+ test "parse any media range with q" do
+ accept = "*/*;q=0.9"
+ expect = [Mime::ALL]
+ assert_equal expect, Mime::Type.parse(accept)
+ end
+
# Accept header send with user HTTP_USER_AGENT: Sunrise/0.42j (Windows XP)
test "parse broken acceptlines" do
accept = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/*,,*/*;q=0.5"

0 comments on commit 45503ec

Please sign in to comment.