diff options
| author | José Valim <jose.valim@gmail.com> | 2009-08-09 11:40:43 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-09 15:53:52 +0100 |
| commit | 32bde66aa67a95a532ed68bbc71a0e9cd5dd4ba6 (patch) | |
| tree | 037a13877db35936f1a3f994488f6d9b87e571db /actionpack/lib/action_controller/metal | |
| parent | 314ba0433f03b66022ad41d55cc75d2bd9809fe3 (diff) | |
| download | rails-32bde66aa67a95a532ed68bbc71a0e9cd5dd4ba6.tar.gz rails-32bde66aa67a95a532ed68bbc71a0e9cd5dd4ba6.tar.bz2 rails-32bde66aa67a95a532ed68bbc71a0e9cd5dd4ba6.zip | |
Make http digest work with different server/browser combinations
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/http_authentication.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index 5ebe1ee048..2b62a1be85 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -197,9 +197,10 @@ module ActionController return false unless password method = request.env['rack.methodoverride.original_method'] || request.env['REQUEST_METHOD'] + uri = credentials[:uri][0,1] == '/' ? request.request_uri : request.url [true, false].any? do |password_is_ha1| - expected = expected_response(method, request.env['REQUEST_URI'], credentials, password, password_is_ha1) + expected = expected_response(method, uri, credentials, password, password_is_ha1) expected == credentials[:response] end end |