diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-10-26 11:31:05 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-10-26 11:31:05 -0700 |
| commit | 0dfdbdd4f447ada9b4d6653f34f609802ae597a5 (patch) | |
| tree | 7bf45f78241c3aeef66fd91f9963b49157f70fff /actionpack | |
| parent | 69a1a0adb5d4e615f08e8b1d23d9a6b0e2dd6070 (diff) | |
| download | rails-0dfdbdd4f447ada9b4d6653f34f609802ae597a5.tar.gz rails-0dfdbdd4f447ada9b4d6653f34f609802ae597a5.tar.bz2 rails-0dfdbdd4f447ada9b4d6653f34f609802ae597a5.zip | |
Fix loop introduced by rack:dda892d
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/url.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index cfee95eb4b..4da82f958a 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -8,11 +8,6 @@ module ActionDispatch protocol + host_with_port + fullpath end - # Returns 'https' if this is an SSL request and 'http' otherwise. - def scheme - ssl? ? 'https' : 'http' - end - # Returns 'https://' if this is an SSL request and 'http://' otherwise. def protocol @protocol ||= ssl? ? 'https://' : 'http://' @@ -99,4 +94,4 @@ module ActionDispatch end end end -end
\ No newline at end of file +end |