summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-08-25 05:19:49 +0200
committerEric Barnes <eric@ericlbarnes.com>2011-08-25 05:19:49 +0200
commitc696253dd044fc8d7de5acf835a9d1a6c144e0b3 (patch)
tree74e9c60a2eceb9386c04b3cf13ae6863b56863e1 /application
parent0ba26c731cf8838b5239c1a7957bc18f58fe2f7d (diff)
parent6a93995f2a24c0ac8d636ecac5f3eb0d0243e23d (diff)
Merge remote-tracking branch 'alexbilbie/csrf-override' into feature/csrf-verify
Conflicts: system/core/Security.php
Diffstat (limited to 'application')
-rw-r--r--application/config/config.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 7554f994a..880393c29 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -296,11 +296,13 @@ $config['global_xss_filtering'] = FALSE;
| 'csrf_token_name' = The token name
| 'csrf_cookie_name' = The cookie name
| 'csrf_expire' = The number in seconds the token should expire.
+| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
*/
$config['csrf_protection'] = FALSE;
$config['csrf_token_name'] = 'csrf_test_name';
$config['csrf_cookie_name'] = 'csrf_cookie_name';
$config['csrf_expire'] = 7200;
+$config['csrf_exclude_uris'] = array();
/*
|--------------------------------------------------------------------------