aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2015-01-28 00:00:17 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2015-01-28 00:00:17 -0500
commit36082a62048248c27cdd513c943ee94b716bd7f8 (patch)
tree517cb021abe0c0679a7c39acf11ed5d55d9a9c51 /actionpack/lib
parent1fb9e6eff71eb84b6cb620282c15b7b89d8e70c1 (diff)
parent98277d1398fa55de25d0b50303ca12aaa061ab75 (diff)
downloadrails-36082a62048248c27cdd513c943ee94b716bd7f8.tar.gz
rails-36082a62048248c27cdd513c943ee94b716bd7f8.tar.bz2
rails-36082a62048248c27cdd513c943ee94b716bd7f8.zip
Merge pull request #18666 from cheunghy/auth_check_nil
Fixed undefined method error when doing http basic authentication.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/http_authentication.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index a219d35b25..20afcee537 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -106,11 +106,11 @@ module ActionController
end
def auth_scheme(request)
- request.authorization.split(' ', 2).first
+ request.authorization.to_s.split(' ', 2).first
end
def auth_param(request)
- request.authorization.split(' ', 2).second
+ request.authorization.to_s.split(' ', 2).second
end
def encode_credentials(user_name, password)