Merge pull request #14948 from owncloud/prefix-memcache

Add version and path to cache prefix

2 files changed, 9 insertions, 1 deletions

diff --git a/lib/private/memcache/cache.php b/lib/private/memcache/cache.php
index c606d94fa51..d2d0353febc 100644
--- a/lib/private/memcache/cache.php
+++ b/lib/private/memcache/cache.php
@@ -21,6 +21,9 @@ abstract class Cache implements \ArrayAccess, \OCP\ICache {
 		$this->prefix = $prefix;
 	}
 
+	/**
+	 * @return string Prefix used for caching purposes
+	 */
 	public function getPrefix() {
 		return $this->prefix;
 	}
diff --git a/lib/private/server.php b/lib/private/server.php
index 2f688c47f09..6261337e0b1 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -157,8 +157,13 @@ class Server extends SimpleContainer implements IServerContainer {
 		});
 		$this->registerService('MemCacheFactory', function ($c) {
 			$config = $c->getConfig();
+			$v = \OC_App::getAppVersions();
+			$v['core'] = implode('.', \OC_Util::getVersion());
+			$version = implode(',', $v);
 			$instanceId = \OC_Util::getInstanceId();
-			return new \OC\Memcache\Factory($instanceId,
+			$path = \OC::$SERVERROOT;
+			$prefix = md5($instanceId.'-'.$version.'-'.$path);
+			return new \OC\Memcache\Factory($prefix,
 				$config->getSystemValue('memcache.local', null),
 				$config->getSystemValue('memcache.distributed', null)
 			);