diff options
| author | Mike Funk <mfunk@xulonpress.com> | 2012-02-23 20:52:23 +0100 |
|---|---|---|
| committer | Mike Funk <mfunk@xulonpress.com> | 2012-02-23 20:52:23 +0100 |
| commit | 27a536dd3570f867ef807ab12391da032b32f09a (patch) | |
| tree | 344b7dab21ea563e54567e428de3791c146e3ae3 /application/config/config.php | |
| parent | 8afb848fded8fbdfa24b72df7f067e960c83c0e8 (diff) | |
| parent | e2675736f3a68b1f64e135d827f6a70e0ae892fb (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/config/config.php')
| -rw-r--r-- | application/config/config.php | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/application/config/config.php b/application/config/config.php index a6d10d8dc..17b854b29 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -1,4 +1,29 @@ <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +/** + * CodeIgniter + * + * An open source application development framework for PHP 5.1.6 or newer + * + * NOTICE OF LICENSE + * + * Licensed under the Academic Free License version 3.0 + * + * This source file is subject to the Academic Free License (AFL 3.0) that is + * bundled with this package in the files license_afl.txt / license_afl.rst. + * It is also available through the world wide web at this URL: + * http://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to obtain it + * through the world wide web, please send an email to + * licensing@ellislab.com so we can send you a copy immediately. + * + * @package CodeIgniter + * @author EllisLab Dev Team + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) + * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) + * @link http://codeigniter.com + * @since Version 1.0 + * @filesource + */ /* |-------------------------------------------------------------------------- @@ -228,6 +253,9 @@ $config['cache_path'] = ''; | | If you use the Encryption class or the Session class you | MUST set an encryption key. See the user guide for info. +| +| http://codeigniter.com/user_guide/libraries/encryption.html +| http://codeigniter.com/user_guide/libraries/sessions.html | */ $config['encryption_key'] = ''; @@ -298,12 +326,14 @@ $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_regenerate' = Regenerate token on every submission | '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_regenerate'] = TRUE; $config['csrf_exclude_uris'] = array(); /* |