Just some more fixed notice

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 98d150ab8434a9214eb03f8c7819c6fc62862541..e0c645565b4018eecce84657b0f0afe8240023b7 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -119,7 +119,7 @@ class Probe
 
                if (!is_object($xrd)) {
                        $ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
-                       if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+                       if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                                logger("Probing timeout for ".$url, LOGGER_DEBUG);
                                return false;
                        }
@@ -731,7 +731,7 @@ class Probe
                $redirects = 0;
 
                $ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
-               if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+               if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                        return false;
                }
                $data = $ret['body'];
@@ -798,7 +798,7 @@ class Probe
        private static function pollNoscrape($noscrape_url, $data)
        {
                $ret = Network::curl($noscrape_url);
-               if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+               if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                        return false;
                }
                $content = $ret['body'];
@@ -1036,7 +1036,7 @@ class Probe
        private static function pollHcard($hcard_url, $data, $dfrn = false)
        {
                $ret = Network::curl($hcard_url);
-               if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+               if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                        return false;
                }
                $content = $ret['body'];
@@ -1283,7 +1283,7 @@ class Probe
                                                }
                                        } elseif (normalise_link($pubkey) == 'http://') {
                                                $ret = Network::curl($pubkey);
-                                               if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+                                               if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                                                        return false;
                                                }
                                                $pubkey = $ret['body'];
@@ -1315,7 +1315,7 @@ class Probe
 
                // Fetch all additional data from the feed
                $ret = Network::curl($data["poll"]);
-               if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+               if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                        return false;
                }
                $feed = $ret['body'];
@@ -1525,7 +1525,7 @@ class Probe
        private static function feed($url, $probe = true)
        {
                $ret = Network::curl($url);
-               if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+               if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                        return false;
                }
                $feed = $ret['body'];

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 7704c3826ac22234dbe3c145a20b6775d9523dec..8d2e6f2b0b1b5b43ca2c880bbb7b78ada342aa0e 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -185,7 +185,7 @@ class OnePoll
 
                        $ret = Network::curl($url);
 
-                       if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+                       if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                                // set the last-update so we don't keep polling
                                dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                Contact::markForArchival($contact);
@@ -321,7 +321,7 @@ class OnePoll
                        $ret = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
                        unlink($cookiejar);
 
-                       if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+                       if (!$ret["success"] && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
                                // set the last-update so we don't keep polling
                                dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
                                Contact::markForArchival($contact);