diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-01 12:41:18 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-06-01 12:41:18 -0300 |
| commit | cf484e3ee3f5935e41fed1a93b2ab069d9e4f969 (patch) | |
| tree | c23ae5cc5dbf2d43cbfb968079280e31eb81cd87 /actionpack/lib/action_controller | |
| parent | 4e63bde623a0478ec55bcbfbe1afd8b4938148c8 (diff) | |
| parent | 4d4440c5a86fc1611b0a236b3253aa3339366788 (diff) | |
| download | rails-cf484e3ee3f5935e41fed1a93b2ab069d9e4f969.tar.gz rails-cf484e3ee3f5935e41fed1a93b2ab069d9e4f969.tar.bz2 rails-cf484e3ee3f5935e41fed1a93b2ab069d9e4f969.zip | |
Merge pull request #19094 from phoet/have_bearer_be_valid_as_well
Have Bearer be valid as well
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/http_authentication.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index 32c3c9652f..fb0a52b076 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -397,7 +397,7 @@ module ActionController # RewriteRule ^(.*)$ dispatch.fcgi [E=X-HTTP_AUTHORIZATION:%{HTTP:Authorization},QSA,L] module Token TOKEN_KEY = 'token=' - TOKEN_REGEX = /^Token / + TOKEN_REGEX = /^(Token|Bearer) / AUTHN_PAIR_DELIMITERS = /(?:,|;|\t+)/ extend self |