diff options
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/ssl.rb | 7 | ||||
| -rw-r--r-- | actionpack/test/dispatch/ssl_test.rb | 6 |
2 files changed, 0 insertions, 13 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" diff --git a/actionpack/test/dispatch/ssl_test.rb b/actionpack/test/dispatch/ssl_test.rb index b1463f31cf..f4cfa75501 100644 --- a/actionpack/test/dispatch/ssl_test.rb +++ b/actionpack/test/dispatch/ssl_test.rb @@ -31,12 +31,6 @@ class SSLTest < ActionDispatch::IntegrationTest response.headers['Location'] end - def test_exclude_from_redirect - self.app = ActionDispatch::SSL.new(default_app, :exclude => lambda { |env| true }) - get "http://example.org/" - assert_response :success - end - def test_hsts_header_by_default get "https://example.org/" assert_equal "max-age=31536000", |