diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 08:28:06 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-07 08:28:06 -0800 |
| commit | dd9b428cbcb6453e01f25a35479a5ab5e19c03fc (patch) | |
| tree | 449032229f700a5ab52d5fd9ec35c862f06e972a /actionpack/lib | |
| parent | ed9aeec92d60c2b62f3cef6b02112ad4401a0bcc (diff) | |
| parent | 3b203f7cb6c54963f74d1ab4237bf7403cc3bf8f (diff) | |
| download | rails-dd9b428cbcb6453e01f25a35479a5ab5e19c03fc.tar.gz rails-dd9b428cbcb6453e01f25a35479a5ab5e19c03fc.tar.bz2 rails-dd9b428cbcb6453e01f25a35479a5ab5e19c03fc.zip | |
Merge pull request #4918 from scottwb/fix-single-accept-with-q
Fix MIME::Type.parse handling of single media with a q value
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index 25affb9f50..2152351703 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -82,6 +82,7 @@ module Mime class << self TRAILING_STAR_REGEXP = /(text|application)\/\*/ + Q_SEPARATOR_REGEXP = /;\s*q=/ def lookup(string) LOOKUP[string] @@ -108,6 +109,7 @@ module Mime 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 @@ module Mime # 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! |