diff options
| author | Stephen Celis <stephen@stephencelis.com> | 2010-10-09 09:13:45 -0500 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-02-02 19:09:44 -0200 |
| commit | a0757e00f3ec2925ee6fdd25498725acf66fae98 (patch) | |
| tree | e742be0ba073bb2eca01ff419c2a90b0a8ace6db /actionpack/lib/action_dispatch | |
| parent | a96a9a494856c57bb8773d8d22bbee176cda9d6e (diff) | |
| download | rails-a0757e00f3ec2925ee6fdd25498725acf66fae98.tar.gz rails-a0757e00f3ec2925ee6fdd25498725acf66fae98.tar.bz2 rails-a0757e00f3ec2925ee6fdd25498725acf66fae98.zip | |
Protocol-relative URL support.
[#5774 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index 796cd8c09b..535ff42b90 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -28,8 +28,11 @@ module ActionDispatch rewritten_url = "" unless options[:only_path] - rewritten_url << (options[:protocol] || "http") - rewritten_url << "://" unless rewritten_url.match("://") + unless options[:protocol] == false + rewritten_url << (options[:protocol] || "http") + rewritten_url << ":" unless rewritten_url.match(%r{:|//}) + end + rewritten_url << "//" unless rewritten_url.match("//") rewritten_url << rewrite_authentication(options) rewritten_url << host_or_subdomain_and_domain(options) rewritten_url << ":#{options.delete(:port)}" if options[:port] |