Merge pull request #8018 from tersmitten/fix-broken-memcached-socket-…

…connection Memcached can not connect using a socket
cakephp · Jan 13, 2016 · e62caa9 · e62caa9
2 parents f3a990d + cbdf6b8
commit e62caa9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Cache/Engine/MemcachedEngine.php b/src/Cache/Engine/MemcachedEngine.php
@@ -241,8 +241,9 @@ protected function _setOptions()
      */
     protected function _parseServerString($server)
     {
-        if (strpos($server, 'unix://') === 0) {
-            return [$server, 0];
+        $socketTransport = 'unix://';
+        if (strpos($server, $socketTransport) === 0) {
+            return [substr($server, strlen($socketTransport)), 0];
         }
         if (substr($server, 0, 1) === '[') {
             $position = strpos($server, ']:');

diff --git a/tests/TestCase/Cache/Engine/MemcachedEngineTest.php b/tests/TestCase/Cache/Engine/MemcachedEngineTest.php
@@ -481,7 +481,7 @@ public function testParseServerStringUnix()
     {
         $Memcached = new TestMemcachedEngine();
         $result = $Memcached->parseServerString('unix:///path/to/memcachedd.sock');
-        $this->assertEquals(['unix:///path/to/memcachedd.sock', 0], $result);
+        $this->assertEquals(['/path/to/memcachedd.sock', 0], $result);
     }
 
     /**