From 54fd3d40246e16376c78a0dccd21b92f2292d765 Mon Sep 17 00:00:00 2001
From: Steve <7024856+stevelipinski@users.noreply.github.com>
Date: Sun, 28 Mar 2021 17:25:30 -0400
Subject: [PATCH] Fix redis-cli handling of rediss:// URL scheme (#8705)

---
 src/redis-cli.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/redis-cli.c b/src/redis-cli.c
index fa6905cc0..7fedd21a7 100644
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -406,15 +406,17 @@ static void parseRedisUri(const char *uri) {
     if (!strncasecmp(tlsscheme, curr, strlen(tlsscheme))) {
 #ifdef USE_OPENSSL
         config.tls = 1;
+        curr += strlen(tlsscheme);
 #else
         fprintf(stderr,"rediss:// is only supported when redis-cli is compiled with OpenSSL\n");
         exit(1);
 #endif
-    } else if (strncasecmp(scheme, curr, strlen(scheme))) {
+    } else if (!strncasecmp(scheme, curr, strlen(scheme))) {
+        curr += strlen(scheme);
+    } else {
         fprintf(stderr,"Invalid URI scheme\n");
         exit(1);
     }
-    curr += strlen(scheme);
     if (curr == end) return;
 
     /* Extract user info. */