Ensure we're talking to redis-server in our high ports test.

michael-grunder · michael-grunder · commit 7825efbcede8 · 2023-09-20T09:36:41.000-07:00
Instead of just checking whether or not something is listening on the
high ports, send a quick PING to make sure.

We're not just using another Redis instance because the point of the
test is to protect against a regression when connecting to high port
numbers.
diff --git a/tests/RedisTest.php b/tests/RedisTest.php
@@ -7323,22 +7323,31 @@ public function testUnixSocket() {
         }
     }
 
+    protected function detectRedis($host, $port) {
+        $sock = @fsockopen($host, $port, $errno, $errstr, .1);
+        if (! $sock)
+            return false;
+
+        stream_set_timeout($sock, 0, 100000);
+
+        $ping_cmd = "*1\r\n$4\r\nPING\r\n";
+        if (fwrite($sock, $ping_cmd) != strlen($ping_cmd))
+            return false;
+
+        return fread($sock, strlen("+PONG\r\n")) == "+PONG\r\n";
+    }
+
     /* Test high ports if we detect Redis running there */
     public function testHighPorts() {
-        $arr_ports = [32767, 32768, 32769];
-        $arr_test_ports = [];
-
-        foreach ($arr_ports as $port) {
-            if (is_resource(@fsockopen('localhost', $port))) {
-                $arr_test_ports[] = $port;
-            }
-        }
+        $ports = array_filter(array_map(function ($port) {
+            return $this->detectRedis('localhost', $port) ? $port : 0;
+        }, [32768, 32769, 32770]));
 
-        if ( ! $arr_test_ports) {
+        if ( ! $ports) {
             return $this->markTestSkipped();
         }
 
-        foreach ($arr_test_ports as $port) {
+        foreach ($ports as $port) {
             $obj_r = new Redis();
             try {
                 @$obj_r->connect('localhost', $port);
