aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/conditional_get.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-08-01 15:29:39 +0200
committerJosé Valim <jose.valim@gmail.com>2009-08-07 17:16:15 +0200
commitf59984cc81bd1a64a53a2480a9b4e05fe7357d7c (patch)
tree66e77bc67fb50cd5dccf19f41120aceab80f21b1 /actionpack/lib/action_controller/metal/conditional_get.rb
parentc44f7e39f46058842845f8c95c3e49f7c59c3aad (diff)
downloadrails-f59984cc81bd1a64a53a2480a9b4e05fe7357d7c.tar.gz
rails-f59984cc81bd1a64a53a2480a9b4e05fe7357d7c.tar.bz2
rails-f59984cc81bd1a64a53a2480a9b4e05fe7357d7c.zip
Add nagivational behavior to respond_with.
Diffstat (limited to 'actionpack/lib/action_controller/metal/conditional_get.rb')
-rw-r--r--actionpack/lib/action_controller/metal/conditional_get.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index 6d35137428..8575d30335 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -55,14 +55,15 @@ module ActionController
elsif args.empty?
raise ArgumentError, "too few arguments to head"
end
- options = args.extract_options!
- status = args.shift || options.delete(:status) || :ok
+ options = args.extract_options!
+ status = args.shift || options.delete(:status) || :ok
+ location = options.delete(:location)
options.each do |key, value|
headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s
end
- render :nothing => true, :status => status
+ render :nothing => true, :status => status, :location => location
end
# Sets the etag and/or last_modified on the response and checks it against