adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8020 from tersmitten/fix-broken-memcached-socket-connection-2x

Browse source 
Memcached can not connect using a socket
This commit is contained in:
Mark Story 2016-01-12 22:08:19 -05:00
commit b4960c7965
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Cache/Engine/MemcachedEngine.php
View file

@ -185,8 +185,9 @@ class MemcachedEngine extends CacheEngine {
* @return array Array containing host, port * @return array Array containing host, port
*/ */
protected function _parseServerString($server) { protected function _parseServerString($server) {
if (strpos($server, 'unix://') === 0) { $socketTransport = 'unix://';
return array($server, 0); if (strpos($server, $socketTransport) === 0) {
return array(substr($server, strlen($socketTransport)), 0);
} }
if (substr($server, 0, 1) === '[') { if (substr($server, 0, 1) === '[') {
$position = strpos($server, ']:'); $position = strpos($server, ']:');

2
lib/Cake/Test/Case/Cache/Engine/MemcachedEngineTest.php
View file

@ -433,7 +433,7 @@ class MemcachedEngineTest extends CakeTestCase {
public function testParseServerStringUnix() { public function testParseServerStringUnix() {
$Memcached = new TestMemcachedEngine(); $Memcached = new TestMemcachedEngine();
$result = $Memcached->parseServerString('unix:///path/to/memcachedd.sock'); $result = $Memcached->parseServerString('unix:///path/to/memcachedd.sock');
$this->assertEquals(array('unix:///path/to/memcachedd.sock', 0), $result); $this->assertEquals(array('/path/to/memcachedd.sock', 0), $result);
} }
/** /**