diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-02 22:19:25 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-02-02 22:19:25 +0100 |
| commit | d88b31550ae2aeb0e3bcc11ba82d4838f8a5fd31 (patch) | |
| tree | 792bff97d41430b5c36a08c8ec3ac54db97375b6 /application | |
| parent | 5c59c7dc3254616b18057922ce012f22c18b147b (diff) | |
| parent | 75f5ff5d99533a423e68686d89889d172c37d98e (diff) | |
Merged recent changes and tweaked multi-env changes.
Diffstat (limited to 'application')
| -rw-r--r-- | application/cache/.htaccess | 1 | ||||
| -rw-r--r-- | application/cache/index.html (renamed from application/config/development/index.html) | 0 | ||||
| -rw-r--r-- | application/config/config.php | 8 | ||||
| -rw-r--r-- | application/config/mimes.php | 2 | ||||
| -rw-r--r-- | application/config/test/index.html | 10 | ||||
| -rw-r--r-- | application/logs/index.html (renamed from application/config/production/index.html) | 0 |
6 files changed, 9 insertions, 12 deletions
diff --git a/application/cache/.htaccess b/application/cache/.htaccess new file mode 100644 index 000000000..3418e55a6 --- /dev/null +++ b/application/cache/.htaccess @@ -0,0 +1 @@ +deny from all
\ No newline at end of file diff --git a/application/config/development/index.html b/application/cache/index.html index c942a79ce..c942a79ce 100644 --- a/application/config/development/index.html +++ b/application/cache/index.html diff --git a/application/config/config.php b/application/config/config.php index 5c6cc0aec..dc029a94b 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -286,9 +286,15 @@ $config['global_xss_filtering'] = FALSE; | Enables a CSRF cookie token to be set. When set to TRUE, token will be | checked on a submitted form. If you are accepting user data, it is strongly | recommended CSRF protection be enabled. +| +| 'csrf_token_name' = The token name +| 'csrf_cookie_name' = The cookie name +| 'csrf_expire' = The number in seconds the token should expire. */ $config['csrf_protection'] = FALSE; - +$config['csrf_token_name'] = 'csrf_test_name'; +$config['csrf_cookie_name'] = 'csrf_cookie_name'; +$config['csrf_expire'] = 7200; /* |-------------------------------------------------------------------------- diff --git a/application/config/mimes.php b/application/config/mimes.php index 3815a5aa9..de923c45a 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -56,7 +56,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'midi' => 'audio/midi', 'mpga' => 'audio/mpeg', 'mp2' => 'audio/mpeg', - 'mp3' => array('audio/mpeg', 'audio/mpg'), + 'mp3' => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3'), 'aif' => 'audio/x-aiff', 'aiff' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', diff --git a/application/config/test/index.html b/application/config/test/index.html deleted file mode 100644 index c942a79ce..000000000 --- a/application/config/test/index.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<head> - <title>403 Forbidden</title> -</head> -<body> - -<p>Directory access is forbidden.</p> - -</body> -</html>
\ No newline at end of file diff --git a/application/config/production/index.html b/application/logs/index.html index c942a79ce..c942a79ce 100644 --- a/application/config/production/index.html +++ b/application/logs/index.html |