summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-05-15 08:43:20 +0200
committerGitHub <noreply@github.com>2019-05-15 08:43:20 +0200
commit9fe4d8e7a1f41aad052f7a6752a153b22046093f (patch)
treec52aabb8763bcc2bb71666fa97383297576a14fe
parentb8c01dc2cde6cf69c6a0139fc433a7951cccabeb (diff)
parentf6d069ee587485aa87e3fa0fbad4053254e1a85e (diff)
downloadnextcloud-server-9fe4d8e7a1f41aad052f7a6752a153b22046093f.tar.gz
nextcloud-server-9fe4d8e7a1f41aad052f7a6752a153b22046093f.zip
Merge pull request #15336 from epma01/redis-patch
Fix Redis with unix socket #730
-rw-r--r--lib/private/RedisFactory.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/RedisFactory.php b/lib/private/RedisFactory.php
index 754437c06c7..22d02e07c29 100644
--- a/lib/private/RedisFactory.php
+++ b/lib/private/RedisFactory.php
@@ -72,8 +72,10 @@ class RedisFactory {
}
if (isset($config['port'])) {
$port = $config['port'];
- } else {
+ } else if ($host[0] !== '/') {
$port = 6379;
+ } else {
+ $port = null;
}
if (isset($config['timeout'])) {
$timeout = $config['timeout'];