From e1330fd877bace698b0615228ef55c2391518b68 Mon Sep 17 00:00:00 2001 From: pupek Date: Fri, 19 Jul 2024 10:32:03 +0200 Subject: [PATCH] Support TLS protocol --- src/Kdyby/Redis/DI/RedisExtension.php | 3 ++- src/Kdyby/Redis/RedisClient.php | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Kdyby/Redis/DI/RedisExtension.php b/src/Kdyby/Redis/DI/RedisExtension.php index c0f1e9e..27e9bf1 100644 --- a/src/Kdyby/Redis/DI/RedisExtension.php +++ b/src/Kdyby/Redis/DI/RedisExtension.php @@ -219,7 +219,8 @@ protected function loadNativeSessionHandler(array $session): void $savePath = $session['host']; } else { - $savePath = \sprintf('tcp://%s:%d', $session['host'], $session['port']); + $protocol = \strpos($session['host'], '://') === false ? 'tcp://' : ''; + $savePath = \sprintf('%s%s:%d', $protocol, $session['host'], $session['port']); } if (!$params['persistent']) { diff --git a/src/Kdyby/Redis/RedisClient.php b/src/Kdyby/Redis/RedisClient.php index c92d997..55960a8 100644 --- a/src/Kdyby/Redis/RedisClient.php +++ b/src/Kdyby/Redis/RedisClient.php @@ -629,7 +629,9 @@ private function formatServerAddress(): string return $this->host; } - return \sprintf('tcp://%s:%s', $this->host, $this->port ?: self::DEFAULT_PORT); + $protocol = (\stripos($this->host, '://') === false) ? 'tcp://' : ''; + + return \sprintf('%s%s:%s', $protocol, $this->host, $this->port ?: self::DEFAULT_PORT); } /************************ syntax sugar ************************/