aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-03-19 16:26:52 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-03-19 16:31:52 -0300
commit139bf55b26e3a415c11fcf631c2dead81bd9df67 (patch)
treea953af07af54b0bdc07718bf8557ab2d87cc4f01 /actionpack/lib
parent09d884cd2cb8f49f0899864cd42649a3bf403872 (diff)
downloadrails-139bf55b26e3a415c11fcf631c2dead81bd9df67.tar.gz
rails-139bf55b26e3a415c11fcf631c2dead81bd9df67.tar.bz2
rails-139bf55b26e3a415c11fcf631c2dead81bd9df67.zip
Remove exclude option from ActionDispatch::SSL
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/ssl.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/ssl.rb b/actionpack/lib/action_dispatch/middleware/ssl.rb
index c758110367..39b27ecbf9 100644
--- a/actionpack/lib/action_dispatch/middleware/ssl.rb
+++ b/actionpack/lib/action_dispatch/middleware/ssl.rb
@@ -13,14 +13,11 @@ module ActionDispatch
@hsts = {} if @hsts == true
@hsts = self.class.default_hsts_options.merge(@hsts) if @hsts
- @exclude = options[:exclude]
@host = options[:host]
@port = options[:port]
end
def call(env)
- return @app.call(env) if exclude?(env)
-
request = Request.new(env)
if request.ssl?
@@ -34,10 +31,6 @@ module ActionDispatch
end
private
- def exclude?(env)
- @exclude && @exclude.call(env)
- end
-
def redirect_to_https(request)
url = URI(request.url)
url.scheme = "https"