aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-11-26 05:35:53 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-11-26 05:35:53 +0000
commit4887e53bf9fd9c35acd05a4cc40a014406132ac2 (patch)
treeb079d3a846fd3b6885b10fb3b3973c35fefa73c1 /actionpack/lib/action_controller
parent093c7257326ea31a832c167f9049b02f897365bf (diff)
downloadrails-4887e53bf9fd9c35acd05a4cc40a014406132ac2.tar.gz
rails-4887e53bf9fd9c35acd05a4cc40a014406132ac2.tar.bz2
rails-4887e53bf9fd9c35acd05a4cc40a014406132ac2.zip
Use Location rather than location header.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5635 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/base.rb2
-rw-r--r--actionpack/lib/action_controller/integration.rb2
-rw-r--r--actionpack/lib/action_controller/test_process.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 288e6d2912..31016a47c5 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -891,7 +891,7 @@ module ActionController #:nodoc:
response.redirected_to = nil
response.redirected_to_method_params = nil
response.headers['Status'] = DEFAULT_RENDER_STATUS_CODE
- response.headers.delete('location')
+ response.headers.delete('Location')
end
# Erase both render and redirect results
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index e9d57ad286..f3175f617d 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -113,7 +113,7 @@ module ActionController
# performed on the location header.
def follow_redirect!
raise "not a redirect! #{@status} #{@status_message}" unless redirect?
- get(interpret_uri(headers["location"].first))
+ get(interpret_uri(headers['Location'].first))
status
end
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index f581f6be35..924d032eec 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -179,7 +179,7 @@ module ActionController #:nodoc:
# returns the redirection location or nil
def redirect_url
- redirect? ? headers['location'] : nil
+ redirect? ? headers['Location'] : nil
end
# does the redirect location match this regexp pattern?