diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-07-19 17:09:13 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-07-19 17:09:13 -0600 |
| commit | f91439d848b305a9d8f83c10905e5012180ffa28 (patch) | |
| tree | 45c01f22da71b298dd2ea0ac3811adfb563d4ee5 /actionpack/lib/action_dispatch/http | |
| parent | e19acbb8831e214eb38d589bf8c424edf80c2970 (diff) | |
| parent | 5bb1d4d288d019e276335465d0389fd2f5246bfd (diff) | |
| download | rails-f91439d848b305a9d8f83c10905e5012180ffa28.tar.gz rails-f91439d848b305a9d8f83c10905e5012180ffa28.tar.bz2 rails-f91439d848b305a9d8f83c10905e5012180ffa28.zip | |
Merge pull request #20946 from schneems/schneems/let-it-go
Freeze string literals when not mutated.
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/parameter_filter.rb | 8 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/http/parameter_filter.rb b/actionpack/lib/action_dispatch/http/parameter_filter.rb index 6e058b829e..e826551f4b 100644 --- a/actionpack/lib/action_dispatch/http/parameter_filter.rb +++ b/actionpack/lib/action_dispatch/http/parameter_filter.rb @@ -34,11 +34,11 @@ module ActionDispatch end end - deep_regexps, regexps = regexps.partition { |r| r.to_s.include?("\\.") } - deep_strings, strings = strings.partition { |s| s.include?("\\.") } + deep_regexps, regexps = regexps.partition { |r| r.to_s.include?("\\.".freeze) } + deep_strings, strings = strings.partition { |s| s.include?("\\.".freeze) } - regexps << Regexp.new(strings.join('|'), true) unless strings.empty? - deep_regexps << Regexp.new(deep_strings.join('|'), true) unless deep_strings.empty? + regexps << Regexp.new(strings.join('|'.freeze), true) unless strings.empty? + deep_regexps << Regexp.new(deep_strings.join('|'.freeze), true) unless deep_strings.empty? new regexps, deep_regexps, blocks end diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index f5b709ccd6..6fcf49030b 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -245,7 +245,7 @@ module ActionDispatch # req = Request.new 'HTTP_HOST' => 'example.com:8080' # req.host # => "example.com" def host - raw_host_with_port.sub(/:\d+$/, '') + raw_host_with_port.sub(/:\d+$/, ''.freeze) end # Returns a \host:\port string for this request, such as "example.com" or |
