summaryrefslogtreecommitdiff
path: root/docs/ref/middleware.txt
diff options
context:
space:
mode:
authorLuke Plant <L.Plant.98@cantab.net>2011-05-30 22:27:47 +0000
committerLuke Plant <L.Plant.98@cantab.net>2011-05-30 22:27:47 +0000
commit524c5fa07a38cc68a81a12428befdafcfde1afc3 (patch)
tree88a59e2870cf181d1165414feb55b6d96e8ff414 /docs/ref/middleware.txt
parentdc4c2f3add4f15edf05574e6e8eb101be9da4b90 (diff)
Fixed #14261 - Added clickjacking protection (X-Frame-Options header)
Many thanks to rniemeyer for the patch! git-svn-id: http://code.djangoproject.com/svn/django/trunk@16298 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/middleware.txt')
-rw-r--r--docs/ref/middleware.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index cb90684847..7bb70986ef 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -204,3 +204,16 @@ Middleware modules running inside it (coming later in the stack) will be under
the same transaction control as the view functions.
See the :doc:`transaction management documentation </topics/db/transactions>`.
+
+X-Frame-Options middleware
+--------------------------
+
+.. module:: django.middleware.clickjacking
+ :synopsis: Clickjacking protection
+
+.. class:: XFrameOptionsMiddleware
+
+.. versionadded:: 1.4
+ ``XFrameOptionsMiddleware`` was added.
+
+Simple :doc:`clickjacking protection via the X-Frame-Options header </ref/clickjacking/>`.