diff options
| author | Jurriaan Pruis <email@jurriaanpruis.nl> | 2012-04-03 15:16:09 +0200 |
|---|---|---|
| committer | Jurriaan Pruis <email@jurriaanpruis.nl> | 2012-04-03 15:16:09 +0200 |
| commit | 2d8396fc9fbea9189e9e945e41e643925da5b2cb (patch) | |
| tree | 9185737cf020abf95ab2bad80c1bdc281c441808 /actionpack/lib/action_controller/metal | |
| parent | 0cc6c5fec235cca6d7eb85d4f849536db8566e93 (diff) | |
| download | rails-2d8396fc9fbea9189e9e945e41e643925da5b2cb.tar.gz rails-2d8396fc9fbea9189e9e945e41e643925da5b2cb.tar.bz2 rails-2d8396fc9fbea9189e9e945e41e643925da5b2cb.zip | |
Updated/changed useless tr/gsubs
Diffstat (limited to 'actionpack/lib/action_controller/metal')
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb index 30ddf6c16e..6f520b1054 100644 --- a/actionpack/lib/action_controller/metal/data_streaming.rb +++ b/actionpack/lib/action_controller/metal/data_streaming.rb @@ -132,7 +132,7 @@ module ActionController #:nodoc: else if !type_provided && options[:filename] # If type wasn't provided, try guessing from file extension. - content_type = Mime::Type.lookup_by_extension(File.extname(options[:filename]).downcase.tr('.','')) || content_type + content_type = Mime::Type.lookup_by_extension(File.extname(options[:filename]).downcase.delete('.')) || content_type end self.content_type = content_type end diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index 44d2f740e6..87225d74c1 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -229,7 +229,7 @@ module ActionController def decode_credentials(header) Hash[header.to_s.gsub(/^Digest\s+/,'').split(',').map do |pair| key, value = pair.split('=', 2) - [key.strip.to_sym, value.to_s.gsub(/^"|"$/,'').gsub(/'/, '')] + [key.strip.to_sym, value.to_s.gsub(/^"|"$/,'').delete('\'')] end] end diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb index 3ffb7ef426..35ded8a56c 100644 --- a/actionpack/lib/action_controller/metal/redirecting.rb +++ b/actionpack/lib/action_controller/metal/redirecting.rb @@ -93,7 +93,7 @@ module ActionController _compute_redirect_to_location options.call else url_for(options) - end.gsub(/[\0\r\n]/, '') + end.delete("\0\r\n") end end end |