diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-12 16:03:44 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-12 16:03:44 +0000 |
| commit | de37f7df4f6bfe369598b2f92b07ce9c2c212e76 (patch) | |
| tree | c1a4b5833b843580eb87db1221befba0e6ee8e24 /actionpack/lib/action_controller/request.rb | |
| parent | 3a90c31a566ec3a818e5cc8f0c2dca58ad305c27 (diff) | |
| download | rails-de37f7df4f6bfe369598b2f92b07ce9c2c212e76.tar.gz rails-de37f7df4f6bfe369598b2f92b07ce9c2c212e76.tar.bz2 rails-de37f7df4f6bfe369598b2f92b07ce9c2c212e76.zip | |
Mime types are separated by a comma, not semicolon, in the Accept header. Also switch all internal configuration of mime types away from strings and over to Mime::Type [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3847 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index cbefc2e490..d5879078af 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -70,8 +70,8 @@ module ActionController @accepts = if @env['HTTP_ACCEPT'].to_s.strip.blank? [ content_type, Mime::ALL ] else - @env['HTTP_ACCEPT'].split(";").collect! do |mime_type| - Mime::Type.lookup(mime_type.strip) + @env['HTTP_ACCEPT'].split(",").collect! do |mime_type| + Mime::Type.lookup(mime_type.split(";").first.strip) end end end |