Merge [5635] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5636 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Nov 26, 2006 · 5b8bfc4 · 5b8bfc4
1 parent f83eedd
commit 5b8bfc4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
@@ -891,7 +891,7 @@ def erase_redirect_results #: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
@@ -113,7 +113,7 @@ def host!(name)
       # 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
@@ -179,7 +179,7 @@ def error?
 
     # 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?