aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/content_security_policy.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_dispatch/http/content_security_policy.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/content_security_policy.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/actionpack/lib/action_dispatch/http/content_security_policy.rb b/actionpack/lib/action_dispatch/http/content_security_policy.rb
index 160c345361..ffac3b8d99 100644
--- a/actionpack/lib/action_dispatch/http/content_security_policy.rb
+++ b/actionpack/lib/action_dispatch/http/content_security_policy.rb
@@ -21,10 +21,7 @@ module ActionDispatch #:nodoc:
return response if policy_present?(headers)
if policy = request.content_security_policy
- built_policy = policy.build(request.controller_instance)
- if built_policy
- headers[header_name(request)] = built_policy
- end
+ headers[header_name(request)] = policy.build(request.controller_instance)
end
response
@@ -175,12 +172,7 @@ module ActionDispatch #:nodoc:
end
def build(context = nil)
- built_directives = build_directives(context).compact
- if built_directives.empty?
- nil
- else
- built_directives.join("; ") + ";"
- end
+ build_directives(context).compact.join("; ")
end
private