Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '1.3' of git://github.com/cakephp/cakephp into 1.3

  • Loading branch information...
commit 92c00e115eedb424784bef612ea0122848e32dc0 2 parents 5c18571 + 9b93393
ceeram ceeram authored
1  app/config/core.php
View
@@ -297,6 +297,7 @@
* '127.0.0.1:11211' // localhost, default port 11211
* ), //[optional]
* 'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
+ * 'persistent' => true, // [optional] set this to false for non-persistent connections
* ));
*
*/
1  cake/console/templates/skel/config/core.php
View
@@ -297,6 +297,7 @@
* '127.0.0.1:11211' // localhost, default port 11211
* ), //[optional]
* 'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
+ * 'persistent' => true, // [optional] set this to false for non-persistent connections
* ));
*
*/
5 cake/libs/cache/memcache.php
View
@@ -67,7 +67,8 @@ function init($settings = array()) {
'engine'=> 'Memcache',
'prefix' => Inflector::slug(APP_DIR) . '_',
'servers' => array('127.0.0.1'),
- 'compress'=> false
+ 'compress'=> false,
+ 'persistent' => true
), $settings)
);
@@ -82,7 +83,7 @@ function init($settings = array()) {
$this->__Memcache =& new Memcache();
foreach ($this->settings['servers'] as $server) {
list($host, $port) = $this->_parseServerString($server);
- if ($this->__Memcache->addServer($host, $port)) {
+ if ($this->__Memcache->addServer($host, $port, $this->settings['persistent'])) {
$return = true;
}
}
2  cake/libs/view/view.php
View
@@ -489,7 +489,7 @@ function renderLayout($content_for_layout, $layout = null) {
$this->output = $this->_render($layoutFileName, $dataForLayout, $loadHelpers, true);
if ($this->output === false) {
- $this->output = $this->_render($layoutFileName, $data_for_layout);
+ $this->output = $this->_render($layoutFileName, $dataForLayout);
trigger_error(sprintf(__("Error in layout %s, got: <blockquote>%s</blockquote>", true), $layoutFileName, $this->output), E_USER_ERROR);
return false;
}
3  cake/tests/cases/libs/cache/memcache.test.php
View
@@ -106,7 +106,8 @@ function testSettings() {
'probability' => 100,
'servers' => array('127.0.0.1'),
'compress' => false,
- 'engine' => 'Memcache'
+ 'engine' => 'Memcache',
+ 'persistent' => true,
);
$this->assertEqual($settings, $expecting);
}
Please sign in to comment.
Something went wrong with that request. Please try again.