From d08a51047ac462ddc90ddd460fc424683aa8dc84 Mon Sep 17 00:00:00 2001 From: Gustav Bertram Date: Mon, 14 Nov 2011 15:10:41 +0200 Subject: Adding a default memcached config file - GWB --- application/config/memcached.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 application/config/memcached.php (limited to 'application/config') diff --git a/application/config/memcached.php b/application/config/memcached.php new file mode 100644 index 000000000..d2ece65cc --- /dev/null +++ b/application/config/memcached.php @@ -0,0 +1,17 @@ + '127.0.0.1', + 'port' => '11211', + 'weight' => '1' +); + +/* End of file memcached.php */ +/* Location: ./application/config/memcached.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From ee04a1c8e25cc98aa5e68b328074efe6d6abf222 Mon Sep 17 00:00:00 2001 From: Gustav Bertram Date: Mon, 14 Nov 2011 15:19:21 +0200 Subject: Adding a default memcached config file - GWB --- application/config/memcached.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'application/config') diff --git a/application/config/memcached.php b/application/config/memcached.php index d2ece65cc..1b34aa683 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -3,14 +3,19 @@ | ------------------------------------------------------------------------- | Memcached settings | ------------------------------------------------------------------------- -| Memcached doesn't seem to like hostnames. Try use an IP first. -GWB +| To add another server, just add another set in the array. +| +| NOTE: Memcached doesn't seem to like hostnames. Try using an IP first. +| -GWB | */ -$config['default'] = array( - 'hostname' => '127.0.0.1', - 'port' => '11211', - 'weight' => '1' +$config = array( + 'default' => array( + 'hostname' => '127.0.0.1', + 'port' => '11211', + 'weight' => '1', + ), ); /* End of file memcached.php */ -- cgit v1.2.3-24-g4f1b From 5280c3c24ec581d859babd80cf60eb83efa7d149 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 28 Dec 2011 15:52:49 +0000 Subject: Turn "pconnect" off by default. Some users were complaining this was effecting their performance and having it on by default can potentially cause issues with people who don't understand what it does. Having it off by default means people are only effected if they want to be, which is safer. --- application/config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config') diff --git a/application/config/database.php b/application/config/database.php index 880773d80..19254cde2 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -80,7 +80,7 @@ $db['default']['password'] = ''; $db['default']['database'] = ''; $db['default']['dbdriver'] = 'mysql'; $db['default']['dbprefix'] = ''; -$db['default']['pconnect'] = TRUE; +$db['default']['pconnect'] = FALSE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; $db['default']['cachedir'] = ''; -- cgit v1.2.3-24-g4f1b From 4b2e9fea1f34b4b2cff30b3211579e883b31005d Mon Sep 17 00:00:00 2001 From: RS71 Date: Sat, 31 Dec 2011 16:02:50 -0200 Subject: Update application/config/config.php --- application/config/config.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 063c3d5d1..70a9856fd 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -326,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(); /* -- cgit v1.2.3-24-g4f1b From 0defe5d33ee2633f377a109519ca818becc60f64 Mon Sep 17 00:00:00 2001 From: Greg Aker Date: Sun, 1 Jan 2012 18:46:41 -0600 Subject: Updating copyright date to 2012 --- application/config/autoload.php | 2 +- application/config/config.php | 2 +- application/config/constants.php | 2 +- application/config/database.php | 2 +- application/config/doctypes.php | 2 +- application/config/foreign_chars.php | 2 +- application/config/hooks.php | 2 +- application/config/migration.php | 2 +- application/config/mimes.php | 2 +- application/config/profiler.php | 2 +- application/config/routes.php | 2 +- application/config/smileys.php | 2 +- application/config/user_agents.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'application/config') diff --git a/application/config/autoload.php b/application/config/autoload.php index a45567b22..db49ca109 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/config.php b/application/config/config.php index 063c3d5d1..bb35324c3 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/constants.php b/application/config/constants.php index 3b79a0363..c7203e47d 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/database.php b/application/config/database.php index 19254cde2..7eac59b23 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/doctypes.php b/application/config/doctypes.php index 48ccc053d..984da5965 100644 --- a/application/config/doctypes.php +++ b/application/config/doctypes.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php index 691762338..1ae0cef5f 100644 --- a/application/config/foreign_chars.php +++ b/application/config/foreign_chars.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/hooks.php b/application/config/hooks.php index 000ae514c..80269df59 100644 --- a/application/config/hooks.php +++ b/application/config/hooks.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/migration.php b/application/config/migration.php index 4fb027b8e..668c35740 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/mimes.php b/application/config/mimes.php index c43f1fc2f..f64db155e 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/profiler.php b/application/config/profiler.php index b0bd2cd1f..f95614241 100644 --- a/application/config/profiler.php +++ b/application/config/profiler.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/routes.php b/application/config/routes.php index b7f4056a5..53fc7e799 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/smileys.php b/application/config/smileys.php index ada329aa1..4132aed2f 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 7f5fe810c..e7a689402 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @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 -- cgit v1.2.3-24-g4f1b From 7c9766a67948613b7fcb141728fb41fcd3ea1844 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 3 Jan 2012 10:18:41 +0200 Subject: Some additions to mimes.php --- application/config/mimes.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'application/config') diff --git a/application/config/mimes.php b/application/config/mimes.php index f64db155e..8c34fd298 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -1,13 +1,13 @@ - array('application/mac-binhex40', 'application/mac-binhe 'log' => array('text/plain', 'text/x-log'), 'rtx' => 'text/richtext', 'rtf' => 'text/rtf', - 'xml' => 'text/xml', - 'xsl' => 'text/xml', + 'xml' => array('application/xml', 'text/xml'), + 'xsl' => array('application/xml', 'text/xsl', 'text/xml'), 'mpeg' => 'video/mpeg', 'mpg' => 'video/mpeg', 'mpe' => 'video/mpeg', @@ -160,8 +160,9 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe 'ac3' => 'audio/ac3', 'flac' => 'audio/x-flac', 'ogg' => 'audio/ogg', + 'kmz' => array('application/vnd.google-earth.kmz', 'application/zip', 'application/x-zip'), + 'kml' => array('application/vnd.google-earth.kml+xml', 'application/xml', 'text/xml') ); - /* End of file mimes.php */ /* Location: ./application/config/mimes.php */ -- cgit v1.2.3-24-g4f1b From 26cba2ae6c47ecbacdf34fe94a32f1f00fbef72c Mon Sep 17 00:00:00 2001 From: Eric Barnes Date: Tue, 3 Jan 2012 23:39:24 -0500 Subject: Updated the memcached config file. --- application/config/memcached.php | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) (limited to 'application/config') diff --git a/application/config/memcached.php b/application/config/memcached.php index 1b34aa683..2b1a77266 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -1,22 +1,46 @@ - array( 'hostname' => '127.0.0.1', 'port' => '11211', 'weight' => '1', - ), -); + ), +); /* End of file memcached.php */ /* Location: ./application/config/memcached.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b