Commitb14b0e1

committed

[Cache] Handle unserialization failures for Memcached

1 parent34d5f9e commitb14b0e1Copy full SHA for b14b0e1

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ trait MemcachedTrait`
`26`	`26`	`'persistent_id' =>null,`
`27`	`27`	`'username' =>null,`
`28`	`28`	`'password' =>null,`
	`29`	`+'serializer' =>'php',`
`29`	`30`	`);`
`30`	`31`
`31`	`32`	`private$client;`
`@@ -186,15 +187,22 @@ public static function createConnection($servers, array $options = array())`
`186`	`187`	`*/`
`187`	`188`	`protectedfunctiondoSave(array$values,$lifetime)`
`188`	`189`	`{`
`189`		`-return$this->checkResultCode($this->client->setMulti($values,$lifetime));`
	`190`	`+return$this->checkResultCode($this->client->setMulti($serialized,$lifetime));`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`/**`
`193`	`194`	`* {@inheritdoc}`
`194`	`195`	`*/`
`195`	`196`	`protectedfunctiondoFetch(array$ids)`
`196`	`197`	`{`
`197`		`-return$this->checkResultCode($this->client->getMulti($ids));`
	`198`	`+$unserializeCallbackHandler =ini_set('unserialize_callback_func',__CLASS__.'::handleUnserializeCallback');`
	`199`	`+try {`
	`200`	`+return$this->checkResultCode($this->client->getMulti($ids));`
	`201`	`+ }catch (\Error$e) {`
	`202`	`+thrownew \ErrorException($e->getMessage(),$e->getCode(),E_ERROR,$e->getFile(),$e->getLine());`
	`203`	`+ }finally {`
	`204`	`+ini_set('unserialize_callback_func',$unserializeCallbackHandler);`
	`205`	`+ }`
`198`	`206`	`}`
`199`	`207`
`200`	`208`	`/**`

Comments

(0)