diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-25 19:34:20 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-25 19:34:20 -0300 |
| commit | dd9d8697466f111299fd9b7cf1cf565f20951e15 (patch) | |
| tree | 28940f6763c52b757e236174f7500b411751e366 /actionpack/lib | |
| parent | f02d4ddc99ad70d1bd50ff70d37aed5f9cf49398 (diff) | |
| parent | 8ffd139edd062fe3e888895d4af80730a0798758 (diff) | |
| download | rails-dd9d8697466f111299fd9b7cf1cf565f20951e15.tar.gz rails-dd9d8697466f111299fd9b7cf1cf565f20951e15.tar.bz2 rails-dd9d8697466f111299fd9b7cf1cf565f20951e15.zip | |
Merge pull request #11000 from sbeckeriv/accept_header
Fix undefined method `ref' for nil:NilClass for bad accept headers
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index 61dbf2b96c..ef144c3c76 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -175,7 +175,7 @@ module Mime def parse(accept_header) if accept_header !~ /,/ accept_header = accept_header.split(PARAMETER_SEPARATOR_REGEXP).first - parse_trailing_star(accept_header) || [Mime::Type.lookup(accept_header)] + parse_trailing_star(accept_header) || [Mime::Type.lookup(accept_header)].compact else list, index = AcceptList.new, 0 accept_header.split(',').each do |header| |