From dc5300adb6d46252c26e239ac67e3ca6e5e2d77b Mon Sep 17 00:00:00 2001 From: Paul Sadauskas Date: Mon, 8 Feb 2010 11:08:31 -0700 Subject: Slightly less annoying check for acceptable mime_types. This allows Accept: application/json, application/jsonp (and the like), but still blacklists browsers. Essentially, we use normal content negotiation unless you include */* in your list, in which case we assume you're a browser and send HTML [#3541 state:resolved] --- actionpack/lib/action_dispatch/http/mime_negotiation.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb index be89924015..4082770b85 100644 --- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb +++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb @@ -48,7 +48,7 @@ module ActionDispatch @env["action_dispatch.request.formats"] ||= if parameters[:format] Array(Mime[parameters[:format]]) - elsif xhr? || (accept && !accept.include?(?,)) + elsif xhr? || (accept && accept !~ /,\s*\*\/\*/) accepts else [Mime::HTML] @@ -87,4 +87,4 @@ module ActionDispatch end end end -end \ No newline at end of file +end -- cgit v1.2.3