From 0da9238252e261002c7d2ad177106ece0dea0f6c Mon Sep 17 00:00:00 2001
From: "masanao.matsubara" <m_matsubara@okwave.co.jp>
Date: Wed, 14 Aug 2013 16:33:33 +0900
Subject: [PATCH] bug: ssl_allowed option is invalid bug

if "ssl_allowed :all" option is double defined
ssl_allowed function is invalid

class ApplicationController < ActionController::Base
 ssl_allowed :all
end

class PaymentController < ApplicationController
 ssl_allowed :all
end

payment controller cannot access https protocol.
---
 lib/ssl_requirement.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ssl_requirement.rb b/lib/ssl_requirement.rb
index aaa08e8..c65c1d5 100644
--- a/lib/ssl_requirement.rb
+++ b/lib/ssl_requirement.rb
@@ -90,7 +90,7 @@ def ssl_exceptions(*actions)
     # ssl_allowed :all
     def ssl_allowed(*actions)
       self.ssl_allowed_actions ||= []
-      self.ssl_allowed_actions += actions
+      self.ssl_allowed_actions != [:all] && self.ssl_allowed_actions += actions
     end
   end