Fix several issues in MemccheSessionStorage which prevented it from being used correctly
This commit is contained in:
parent
3236fc5af3
commit
2a65121865
12
src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php
Normal file → Executable file
12
src/Symfony/Component/HttpFoundation/Session/Storage/MemcacheSessionStorage.php
Normal file → Executable file
@ -72,14 +72,18 @@ class MemcacheSessionStorage extends AbstractSessionStorage implements SessionHa
|
|||||||
|
|
||||||
protected function addServer(array $server)
|
protected function addServer(array $server)
|
||||||
{
|
{
|
||||||
if (array_key_exists('host', $server)) {
|
if (!array_key_exists('host', $server)) {
|
||||||
throw new \InvalidArgumentException('host key must be set');
|
throw new \InvalidArgumentException('host key must be set');
|
||||||
}
|
}
|
||||||
|
|
||||||
$server['port'] = isset($server['port']) ? (int)$server['port'] : 11211;
|
$server['port'] = isset($server['port']) ? (int)$server['port'] : 11211;
|
||||||
$server['timeout'] = isset($server['timeout']) ? (int)$server['timeout'] : 1;
|
$server['timeout'] = isset($server['timeout']) ? (int)$server['timeout'] : 1;
|
||||||
$server['presistent'] = isset($server['presistent']) ? (bool)$server['presistent'] : false;
|
$server['persistent'] = isset($server['persistent']) ? (bool)$server['persistent'] : false;
|
||||||
$server['weight'] = isset($server['weight']) ? (bool)$server['weight'] : 1;
|
$server['weight'] = isset($server['weight']) ? (int)$server['weight'] : 1;
|
||||||
|
$server['retry_interval'] = isset($server['retry_interval']) ? (int)$server['retry_interval'] : 15;
|
||||||
|
|
||||||
|
$this->memcache->addserver($server['host'], $server['port'], $server['persistent'],$server['weight'],$server['timeout'],$server['retry_interval']);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -88,7 +92,7 @@ class MemcacheSessionStorage extends AbstractSessionStorage implements SessionHa
|
|||||||
public function open($savePath, $sessionName)
|
public function open($savePath, $sessionName)
|
||||||
{
|
{
|
||||||
foreach ($this->memcacheOptions['serverpool'] as $server) {
|
foreach ($this->memcacheOptions['serverpool'] as $server) {
|
||||||
$this->memcache->addServer($server);
|
$this->addServer($server);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
Reference in New Issue
Block a user