github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate ActionController::Response#set_cookie :http_only option infavor of :httponly

Browse Source
This commit is contained in:
Joshua Peek
2009-02-07 15:37:54 -06:00
parent 3c625d65e8
commit 0edb0a4fac
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_controller/cookies.rb
View File

@@ -41,7 +41,7 @@ module ActionController #:nodoc:
# * <tt>:expires</tt> - The time at which this cookie expires, as a Time object.
# * <tt>:secure</tt> - Whether this cookie is a only transmitted to HTTPS servers.
# Default is +false+.
# * <tt>:http_only</tt> - Whether this cookie is accessible via scripting or
# * <tt>:httponly</tt> - Whether this cookie is accessible via scripting or
# only HTTP. Defaults to +false+.
module Cookies
def self.included(base)

3
actionpack/lib/action_controller/response.rb
View File

@@ -169,6 +169,9 @@ module ActionController # :nodoc:
def set_cookie(key, value)
if value.has_key?(:http_only)
ActiveSupport::Deprecation.warn(
"The :http_only option in ActionController::Response#set_cookie " +
"has been renamed. Please use :httponly instead.", caller)
value[:httponly] ||= value.delete(:http_only)
end

2
actionpack/test/controller/cookie_test.rb
View File

@@ -33,7 +33,7 @@ class CookieTest < ActionController::TestCase
end
def authenticate_with_http_only
cookies["user_name"] = { :value => "david", :http_only => true }
cookies["user_name"] = { :value => "david", :httponly => true }
end
def rescue_action(e)