summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY.txt6
-rw-r--r--docs/whatsnew-1.8.rst7
2 files changed, 13 insertions, 0 deletions
diff --git a/HISTORY.txt b/HISTORY.txt
index c10747af4..c69d9514e 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -198,6 +198,12 @@ Features
See https://github.com/Pylons/pyramid/pull/2873
+- Added a new ``callback`` option to ``config.set_default_csrf_options`` which
+ can be used to determine per-request whether CSRF checking should be enabled
+ to allow for a mix authentication methods. Only cookie-based methods
+ generally require CSRF checking.
+ See https://github.com/Pylons/pyramid/pull/2778
+
Bug Fixes
---------
diff --git a/docs/whatsnew-1.8.rst b/docs/whatsnew-1.8.rst
index adc60b34b..ff16c1a4b 100644
--- a/docs/whatsnew-1.8.rst
+++ b/docs/whatsnew-1.8.rst
@@ -114,6 +114,13 @@ Minor Feature Additions
later calls to place translation directories at a higher priority then
earlier calls. See https://github.com/Pylons/pyramid/pull/2902
+- Added a new ``callback`` option to
+ :meth:`pyramid.config.Configurator.set_default_csrf_options`` which
+ can be used to determine per-request whether CSRF checking should be enabled
+ to allow for a mix authentication methods. Only cookie-based methods
+ generally require CSRF checking.
+ See https://github.com/Pylons/pyramid/pull/2778
+
Backwards Incompatibilities
---------------------------