diff options
author | José Valim <jose.valim@gmail.com> | 2010-11-28 11:48:39 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-11-28 11:54:00 +0100 |
commit | a4c360e8c7b7c2635de3c1172dafff7b7975ecc5 (patch) | |
tree | 19e22d62ad1afa96ff5e48523f9d8b213e12c0e7 /actionpack/lib | |
parent | 76053fe4d12bd2be38e16b3322f9de73e09b43bc (diff) | |
download | rails-a4c360e8c7b7c2635de3c1172dafff7b7975ecc5.tar.gz rails-a4c360e8c7b7c2635de3c1172dafff7b7975ecc5.tar.bz2 rails-a4c360e8c7b7c2635de3c1172dafff7b7975ecc5.zip |
trailing star mimes should respect the order in which mime types are defined.
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index 08eab5634a..3e3478a44e 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -115,15 +115,20 @@ module Mime end else # keep track of creation order to keep the subsequent sort stable - list = [] - accept_header.split(/,/).each_with_index do |header, index| + list, index = [], 0 + accept_header.split(/,/).each do |header| params, q = header.split(/;\s*q=/) - if params + if params.present? params.strip! + if params =~ TRAILING_STAR_REGEXP - parse_data_with_trailing_star($1).each { |m| list << AcceptItem.new(index, m.to_s, q) } + parse_data_with_trailing_star($1).each do |m| + list << AcceptItem.new(index, m.to_s, q) + index += 1 + end else - list << AcceptItem.new(index, params, q) unless params.empty? + list << AcceptItem.new(index, params, q) + index += 1 end end end @@ -178,8 +183,7 @@ module Mime # input: 'application' # returend value: [Mime::HTML, Mime::JS, Mime::XML, Mime::YAML, Mime::ATOM, Mime::JSON, Mime::RSS, Mime::URL_ENCODED_FORM def parse_data_with_trailing_star(input) - keys = Mime::LOOKUP.keys.select{|k| k.include?(input)} - Mime::LOOKUP.values_at(*keys).uniq + Mime::SET.select { |m| m =~ input } end # This method is opposite of register method. |