aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/http_authentication.rb
diff options
context:
space:
mode:
authorArthur Smith <arthurpsmith@gmail.com>2011-07-28 10:06:45 -0400
committerSteve Klabnik <steve@steveklabnik.com>2012-08-02 15:24:08 -0400
commitb3e2abc4b130a27403ad1d25260c9200eb7cfaf0 (patch)
tree1eca97a803dcf3d48beb43ff7344555d5d3bd555 /actionpack/lib/action_controller/metal/http_authentication.rb
parentd87524773d165ccd7292e61c4ee21be87f2b0703 (diff)
downloadrails-b3e2abc4b130a27403ad1d25260c9200eb7cfaf0.tar.gz
rails-b3e2abc4b130a27403ad1d25260c9200eb7cfaf0.tar.bz2
rails-b3e2abc4b130a27403ad1d25260c9200eb7cfaf0.zip
Fix for digest authentication bug - issue #2301 in rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/metal/http_authentication.rb')
-rw-r--r--actionpack/lib/action_controller/metal/http_authentication.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index d84588d3df..8466db5952 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -194,7 +194,7 @@ module ActionController
return false unless password
method = request.env['rack.methodoverride.original_method'] || request.env['REQUEST_METHOD']
- uri = credentials[:uri][0,1] == '/' ? request.original_fullpath : request.original_url
+ uri = credentials[:uri]
[true, false].any? do |trailing_question_mark|
[true, false].any? do |password_is_ha1|