]> git.mxchange.org Git - friendica.git/commitdiff
Don't compare with an empty redirect url
authorMichael <heluecht@pirati.ca>
Sat, 18 Dec 2021 10:07:16 +0000 (10:07 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 18 Dec 2021 10:07:16 +0000 (10:07 +0000)
src/Model/GServer.php

index d133d7f18d2fc796bbf67081b8edd956b835c90a..57b533a93a7f33a4c3dade9ee99440f2e7e6a66e 100644 (file)
@@ -351,7 +351,7 @@ class GServer
                // On a redirect follow the new host but mark the old one as failure
                if ($curlResult->isSuccess() && !empty($curlResult->getRedirectUrl()) && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
                        $curlResult = DI::httpClient()->get($url, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
-                       if (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
+                       if (!empty($curlResult->getRedirectUrl()) && parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
                                Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
                                self::setFailure($url);
                                self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);
@@ -388,7 +388,7 @@ class GServer
 
                                $curlResult = DI::httpClient()->get($baseurl, [HttpClientOptions::TIMEOUT => $xrd_timeout]);
                                if ($curlResult->isSuccess()) {
-                                       if ((parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
+                                       if (!empty($curlResult->getRedirectUrl()) && (parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
                                                Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
                                                self::setFailure($url);
                                                self::detect($curlResult->getRedirectUrl(), $network, $only_nodeinfo);