diff options
| author | Kelley Reynolds <kelley@insidesystems.net> | 2014-03-28 13:19:47 -0400 |
|---|---|---|
| committer | Kelley Reynolds <kelley@insidesystems.net> | 2014-03-28 13:19:47 -0400 |
| commit | e43cd0a4c9c1d33c7d1007a51ad885a579c0bfbc (patch) | |
| tree | f8f8d19f5f40bf4b368523ba5525b1bd75182f90 /actionpack | |
| parent | 74d7df175c83e73347114c004ff861aec0572928 (diff) | |
| download | rails-e43cd0a4c9c1d33c7d1007a51ad885a579c0bfbc.tar.gz rails-e43cd0a4c9c1d33c7d1007a51ad885a579c0bfbc.tar.bz2 rails-e43cd0a4c9c1d33c7d1007a51ad885a579c0bfbc.zip | |
Replace trivial regexp with string or index, twice as fast
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/http_authentication.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 2 |
2 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 1acc19d74b..2eb7853aa6 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -96,7 +96,7 @@ module ActionController end def user_name_and_password(request) - decode_credentials(request).split(/:/, 2) + decode_credentials(request).split(':', 2) end def decode_credentials(request) diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index 3d2dd2d632..9450be838c 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -174,7 +174,7 @@ module Mime end def parse(accept_header) - if accept_header !~ /,/ + if !accept_header.include?(',') accept_header = accept_header.split(PARAMETER_SEPARATOR_REGEXP).first parse_trailing_star(accept_header) || [Mime::Type.lookup(accept_header)].compact else |