diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-18 20:01:06 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-18 20:01:06 -0300 |
| commit | 1cc44599397e061901cd59233397129625839a60 (patch) | |
| tree | 235108ce6a9d270bdfe3264a8f5f5a7c99c3ae5c /actionpack/lib/action_controller/base/http_authentication.rb | |
| parent | 3db44e938fc6b5a5d272c4df4cf06dd6b5715782 (diff) | |
| parent | ee5520a0a5ea83843ce88f6b9550e3c36b8cdd49 (diff) | |
| download | rails-1cc44599397e061901cd59233397129625839a60.tar.gz rails-1cc44599397e061901cd59233397129625839a60.tar.bz2 rails-1cc44599397e061901cd59233397129625839a60.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record.rb
Updated:
Arel submodule
Diffstat (limited to 'actionpack/lib/action_controller/base/http_authentication.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base/http_authentication.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/http_authentication.rb b/actionpack/lib/action_controller/base/http_authentication.rb index fa8ecea408..2893290efb 100644 --- a/actionpack/lib/action_controller/base/http_authentication.rb +++ b/actionpack/lib/action_controller/base/http_authentication.rb @@ -194,9 +194,10 @@ module ActionController if valid_nonce && realm == credentials[:realm] && opaque == credentials[:opaque] password = password_procedure.call(credentials[:username]) + method = request.env['rack.methodoverride.original_method'] || request.env['REQUEST_METHOD'] [true, false].any? do |password_is_ha1| - expected = expected_response(request.env['REQUEST_METHOD'], request.env['REQUEST_URI'], credentials, password, password_is_ha1) + expected = expected_response(method, request.env['REQUEST_URI'], credentials, password, password_is_ha1) expected == credentials[:response] end end |