From 0dfdbdd4f447ada9b4d6653f34f609802ae597a5 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 26 Oct 2010 11:31:05 -0700 Subject: [PATCH] Fix loop introduced by rack:dda892d --- actionpack/lib/action_dispatch/http/url.rb | 7 +------ 1 file changed, 1 insertion(+), 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 @@ def url 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 @@ def named_host?(host) end end end -end \ No newline at end of file +end -- GitLab