Dont call authenticate_or_request_with_http_basic twice

rails · Mar 29, 2011 · e8d20b8 · e8d20b8
1 parent 52351bc
commit e8d20b8
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -110,10 +110,8 @@ module ControllerMethods
         module ClassMethods
           def http_basic_authenticate_with(options = {})
             before_filter(options.except(:name, :password, :realm)) do
-              authenticate_or_request_with_http_basic(options[:realm] || "Application") do
+              authenticate_or_request_with_http_basic(options[:realm] || "Application") do |name, password|
-                authenticate_or_request_with_http_basic do |name, password|
+                name == options[:name] && password == options[:password]
-                  name == options[:name] && password == options[:password]
-                end
               end
             end
           end