aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/http_authentication.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/http_authentication.rb')
-rw-r--r--actionpack/lib/action_controller/http_authentication.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/http_authentication.rb b/actionpack/lib/action_controller/http_authentication.rb
index 170098dc58..18a503c3ad 100644
--- a/actionpack/lib/action_controller/http_authentication.rb
+++ b/actionpack/lib/action_controller/http_authentication.rb
@@ -93,9 +93,7 @@ module ActionController
end
def authenticate(controller, &login_procedure)
- if authorization(controller.request).blank?
- false
- else
+ unless authorization(controller.request).blank?
login_procedure.call(*user_name_and_password(controller.request))
end
end
@@ -122,7 +120,6 @@ module ActionController
def authentication_request(controller, realm)
controller.headers["WWW-Authenticate"] = %(Basic realm="#{realm.gsub(/"/, "")}")
controller.send! :render, :text => "HTTP Basic: Access denied.\n", :status => :unauthorized
- return false
end
end
end