0
@@ -605,35 +605,14 @@ module Sinatra
0
       end
0
       
0
       def authenticate_with_http_basic(&login_procedure)
0
-        def authenticate(&login_procedure)
0
-          def authorization
0
-            request.env['HTTP_AUTHORIZATION']   ||
0
-            request.env['X-HTTP_AUTHORIZATION'] ||
0
-            request.env['X_HTTP_AUTHORIZATION'] ||
0
-            request.env['REDIRECT_X_HTTP_AUTHORIZATION']
0
-          end
0
-
0
-          # Decodes credentials (Base64)
0
-          def user_name_and_password
0
-            (authorization.split.last || '').unpack("m")[0].split(/:/, 2)
0
-          end
0
-
0
-          if authorization
0
-            login_procedure.call(*user_name_and_password)
0
-          end
0
-        end
0
-
0
-        authenticate(&login_procedure)
0
+        auth = Rack::Auth::Basic::Request.new(request.env)
0
+        login_procedure.call(*auth.credentials) if auth.provided? && auth.basic?
0
       end
0
       
0
       def request_http_basic_authentication(realm = "Application")
0
-        def authentication_request(realm)
0
-          status(401)
0
-          header("WWW-Authenticate" => %(Basic realm="#{realm.gsub(/"/, "")}"))
0
-          throw :halt, "HTTP Basic: Access denied.\n"
0
-        end
0
-
0
-        authentication_request(realm)
0
+        status(401)
0
+        header("WWW-Authenticate" => 'Basic realm="%s"' % realm)
0
+        throw :halt, "HTTP Basic: Access denied.\n"
0
       end
0
       
0
     end