diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-07-10 00:07:03 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-10 00:07:03 +0930 |
| commit | 551f88366dcbaed3b0abc89bddd63975c4c9a5ca (patch) | |
| tree | ab9306fac3d48ff7dc8556076c8d07b38bcfc381 /actionpack/lib/action_dispatch/http | |
| parent | 8d98bb0cc6e2baf1694971ae2bdf19e8b8bcdce5 (diff) | |
| parent | b3f3d49fd6b91c6573b3e10e3d00f65306638927 (diff) | |
| download | rails-551f88366dcbaed3b0abc89bddd63975c4c9a5ca.tar.gz rails-551f88366dcbaed3b0abc89bddd63975c4c9a5ca.tar.bz2 rails-551f88366dcbaed3b0abc89bddd63975c4c9a5ca.zip | |
Merge pull request #29655 from kirs/frozen-friendly-ap-ar
Prepare AP and AR to be frozen string friendly
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 648348d9de..914163f219 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require "stringio" require "active_support/inflector" diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index f902fe36e0..28672e2a1a 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require "active_support/core_ext/module/attribute_accessors" module ActionDispatch @@ -155,7 +156,7 @@ module ActionDispatch subdomain = options.fetch :subdomain, true domain = options[:domain] - host = "" + host = "".dup if subdomain == true return _host if domain.nil? |