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/memcached.php') 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/memcached.php') 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 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/memcached.php') 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 From 07c1ac830b4e98aa40f48baef3dd05fb68c0a836 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 9 Mar 2012 17:03:37 +0000 Subject: Bumped CodeIgniter's PHP requirement to 5.2.4. Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway... --- application/config/memcached.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/memcached.php') diff --git a/application/config/memcached.php b/application/config/memcached.php index 2b1a77266..7166b70ba 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * -- cgit v1.2.3-24-g4f1b From 80500afbd188600212ca913a7bac073009feac73 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 1 Jan 2013 08:16:53 +0200 Subject: [ci skip] Happy new year --- application/config/memcached.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/memcached.php') diff --git a/application/config/memcached.php b/application/config/memcached.php index 7166b70ba..714e81f6b 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2013, 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 2.0 -- cgit v1.2.3-24-g4f1b From 871754af60251993d640981e107d2def5f2db396 Mon Sep 17 00:00:00 2001 From: darwinel Date: Tue, 11 Feb 2014 17:34:57 +0100 Subject: 2013 > 2014 Update copyright notices from 2013 to 2014. And update one calendar example in user_guide from year 2013/2014 to 2014/2015. --- application/config/memcached.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/memcached.php') diff --git a/application/config/memcached.php b/application/config/memcached.php index 714e81f6b..0499c66b5 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2014, 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 2.0 -- cgit v1.2.3-24-g4f1b From d8bef8a878238c6974f01758469af1c13ac8b8d7 Mon Sep 17 00:00:00 2001 From: darwinel Date: Tue, 11 Feb 2014 20:13:22 +0100 Subject: "BASEPATH check" consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As described in issue #2870 + A change in the „How to create a library” example in the user_guide --- application/config/memcached.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/config/memcached.php') diff --git a/application/config/memcached.php b/application/config/memcached.php index 0499c66b5..373536d44 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -1,4 +1,4 @@ - Date: Tue, 28 Oct 2014 00:13:31 +0200 Subject: [ci skip] Switch to MIT license; close #3293 --- application/config/memcached.php | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'application/config/memcached.php') diff --git a/application/config/memcached.php b/application/config/memcached.php index 373536d44..568f36b9e 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -4,24 +4,35 @@ * * An open source application development framework for PHP 5.2.4 or newer * - * NOTICE OF LICENSE + * This content is released under the MIT License (MIT) * - * Licensed under the Academic Free License version 3.0 + * Copyright (c) 2014, British Columbia Institute of Technology * - * 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. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * @package CodeIgniter - * @author EllisLab Dev Team + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @package CodeIgniter + * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, 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 2.0 + * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @license http://opensource.org/licenses/MIT MIT License + * @link http://codeigniter.com + * @since Version 2.0.0 * @filesource */ defined('BASEPATH') OR exit('No direct script access allowed'); -- cgit v1.2.3-24-g4f1b From fe9309d22c1b088f5363954d6dac013c8c955894 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 9 Jan 2015 17:48:58 +0200 Subject: Bulk (mostly documentation) update - Remove PHP version from license notices - Bump year number in copyright notices - Recommend PHP 5.4 or newer to be used - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version Related: #3450 --- application/config/memcached.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'application/config/memcached.php') diff --git a/application/config/memcached.php b/application/config/memcached.php index 568f36b9e..b35730d34 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -2,11 +2,11 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.2.4 or newer + * An open source application development framework for PHP * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014, British Columbia Institute of Technology + * Copyright (c) 2014 - 2015, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link http://codeigniter.com * @since Version 2.0.0 -- cgit v1.2.3-24-g4f1b From 4cbe463b4c442e0e2dae2f43565e77f7ac5ecb86 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Wed, 21 Jan 2015 22:56:22 +0100 Subject: Remove closing blocks at end of PHP files --- application/config/memcached.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'application/config/memcached.php') diff --git a/application/config/memcached.php b/application/config/memcached.php index b35730d34..9374f67b4 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -53,6 +53,3 @@ $config = array( '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 b56de6537e9d9a6156dbeaa325f52d3b6e3792a4 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Thu, 22 Jan 2015 21:27:38 +0100 Subject: Remove license blocks in /application files These blocks are annoying for the user and serve little to no purpose as the files are just config files, a boilerplate controller and some views. --- application/config/memcached.php | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'application/config/memcached.php') diff --git a/application/config/memcached.php b/application/config/memcached.php index 9374f67b4..55949a66c 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -1,40 +1,4 @@ Date: Mon, 11 Jan 2016 12:50:18 +0200 Subject: [ci skip] Update codeigniter.com links to https --- application/config/memcached.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/config/memcached.php') diff --git a/application/config/memcached.php b/application/config/memcached.php index 55949a66c..5c23b39c1 100644 --- a/application/config/memcached.php +++ b/application/config/memcached.php @@ -7,7 +7,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | ------------------------------------------------------------------------- | Your Memcached servers can be specified below. | -| See: http://codeigniter.com/user_guide/libraries/caching.html#memcached +| See: https://codeigniter.com/user_guide/libraries/caching.html#memcached | */ $config = array( -- cgit v1.2.3-24-g4f1b