aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/mime_type.rb
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2013-06-02 00:07:58 +0900
committerkennyj <kennyj@gmail.com>2013-06-02 00:07:58 +0900
commit74f2b41ce06492da307c7f00b011a8c5106e1151 (patch)
tree545dc0cfc1c819812dbfdf04af9aeb9135be1705 /actionpack/lib/action_dispatch/http/mime_type.rb
parent6ff923a1801573577bc482384b071d598ef47aa8 (diff)
downloadrails-74f2b41ce06492da307c7f00b011a8c5106e1151.tar.gz
rails-74f2b41ce06492da307c7f00b011a8c5106e1151.tar.bz2
rails-74f2b41ce06492da307c7f00b011a8c5106e1151.zip
Remove Mime::Type#verify_request? and Mime::Type.browser_generated_types were deprecated.
Diffstat (limited to 'actionpack/lib/action_dispatch/http/mime_type.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/mime_type.rb16
1 files changed, 0 insertions, 16 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index f29ad359ac..61dbf2b96c 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -53,10 +53,6 @@ module Mime
@@html_types = Set.new [:html, :all]
cattr_reader :html_types
- # These are the content types which browsers can generate without using ajax, flash, etc
- # i.e. following a link, getting an image or posting a form. CSRF protection
- # only needs to protect against these types.
- @@browser_generated_types = Set.new [:html, :url_encoded_form, :multipart_form, :text]
attr_reader :symbol
@register_callbacks = []
@@ -272,18 +268,6 @@ module Mime
end
end
- # Returns true if Action Pack should check requests using this Mime Type for possible request forgery. See
- # ActionController::RequestForgeryProtection.
- def verify_request?
- ActiveSupport::Deprecation.warn "Mime::Type#verify_request? is deprecated and will be removed in Rails 4.1"
- @@browser_generated_types.include?(to_sym)
- end
-
- def self.browser_generated_types
- ActiveSupport::Deprecation.warn "Mime::Type.browser_generated_types is deprecated and will be removed in Rails 4.1"
- @@browser_generated_types
- end
-
def html?
@@html_types.include?(to_sym) || @string =~ /html/
end