summaryrefslogtreecommitdiff
path: root/HISTORY.txt
diff options
context:
space:
mode:
authorJeremy Chen <jeremy886@gmail.com>2017-04-15 19:14:09 +1000
committerJeremy Chen <jeremy886@gmail.com>2017-04-15 19:14:09 +1000
commitbcde632349de081880ce4fe49982defb832a030c (patch)
tree5fa7e97bc0cafeae074bf942af12bd5a316d3dcc /HISTORY.txt
parent1bd681193feef31d032c13e7022bc2d65d9e0a21 (diff)
parent2078f2cf5188491581cf1c362a583af2b2cbc2fe (diff)
downloadpyramid-bcde632349de081880ce4fe49982defb832a030c.tar.gz
pyramid-bcde632349de081880ce4fe49982defb832a030c.tar.bz2
pyramid-bcde632349de081880ce4fe49982defb832a030c.zip
Merge remote-tracking branch 'Pylons/master'
Diffstat (limited to 'HISTORY.txt')
-rw-r--r--HISTORY.txt6
1 files changed, 6 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
---------