From 606cd61b9a2a710a27c2e482b5dace100cce9779 Mon Sep 17 00:00:00 2001 From: Frederick Cheung Date: Sun, 21 Dec 2008 02:11:39 +0000 Subject: [PATCH] Fix Mime::Type#=~ not using Regexp.quote Signed-off-by: Pratik Naik --- actionpack/lib/action_controller/mime_type.rb | 2 +- actionpack/test/controller/mime_type_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_controller/mime_type.rb b/actionpack/lib/action_controller/mime_type.rb index 43b3da8d35be1..017626ba272af 100644 --- a/actionpack/lib/action_controller/mime_type.rb +++ b/actionpack/lib/action_controller/mime_type.rb @@ -178,7 +178,7 @@ def ==(mime_type) def =~(mime_type) return false if mime_type.blank? - regexp = Regexp.new(mime_type.to_s) + regexp = Regexp.new(Regexp.quote(mime_type.to_s)) (@synonyms + [ self ]).any? do |synonym| synonym.to_s =~ regexp end diff --git a/actionpack/test/controller/mime_type_test.rb b/actionpack/test/controller/mime_type_test.rb index 9c4416ecf0c86..c7faa621d96da 100644 --- a/actionpack/test/controller/mime_type_test.rb +++ b/actionpack/test/controller/mime_type_test.rb @@ -88,5 +88,6 @@ def test_regexp_matcher assert Mime::JS !~ "text/html" assert !(Mime::JS !~ "text/javascript") assert !(Mime::JS !~ "application/javascript") + assert Mime::HTML =~ 'application/xhtml+xml' end end