From d08a51047ac462ddc90ddd460fc424683aa8dc84 Mon Sep 17 00:00:00 2001
From: Gustav Bertram <gustav.bertram@gmail.com>
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 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/*
+| -------------------------------------------------------------------------
+| Memcached settings
+| -------------------------------------------------------------------------
+| Memcached doesn't seem to like hostnames. Try use an IP first. -GWB
+|
+*/
+
+$config['default'] = 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 ee04a1c8e25cc98aa5e68b328074efe6d6abf222 Mon Sep 17 00:00:00 2001
From: Gustav Bertram <gustav.bertram@gmail.com>
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 <eric@ericlbarnes.com>
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 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?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 2.0
+ * @filesource
+ */
+
 /*
 | -------------------------------------------------------------------------
 | Memcached settings
 | -------------------------------------------------------------------------
-| To add another server, just add another set in the array.
+| Your Memcached servers can be specified below.
 |
-| NOTE: Memcached doesn't seem to like hostnames. Try using an IP first. 
-| -GWB
+|	See: http://codeigniter.com/user_guide/libraries/caching.html#memcached
 |
 */
-
 $config = array(
 	'default' => 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 <email@philsturgeon.co.uk>
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