summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimeon J Morgan <smorgan@digitalfeed.net>2015-06-02 14:11:01 +1000
committerTim Graham <timograham@gmail.com>2015-06-02 09:02:46 -0400
commit3b41850adcce29b0c2e64d9c6f3d34ffcc7d750b (patch)
tree3f79dc2288f85edc0305a4957ee774c3ffb715cf /docs
parentaefa3a6a03e1a14e994c5fb3aaae38f7c1ec41fa (diff)
[1.8.x] Fixed #24896 -- Doc'd clickjacking protection doesn't overwrite X-Frame-Options header.
Backport of 0b5fb8e72c74e41d250f35c8c3df3f3a13d367f3 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/clickjacking.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/ref/clickjacking.txt b/docs/ref/clickjacking.txt
index 5ce26ba43b..f236673cd0 100644
--- a/docs/ref/clickjacking.txt
+++ b/docs/ref/clickjacking.txt
@@ -45,6 +45,9 @@ site:
2. A set of view decorators that can be used to override the middleware or to
only set the header for certain views.
+The ``X-Frame-Options`` HTTP header will only be set by the middleware or view
+decorators if it is not already present in the response.
+
How to use it
=============