]> git.mxchange.org Git - friendica.git/commitdiff
Added timeout
authorMichael <heluecht@pirati.ca>
Tue, 18 Jun 2019 08:05:45 +0000 (08:05 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 18 Jun 2019 08:05:45 +0000 (08:05 +0000)
src/Model/APContact.php

index 7e49638f9e6ac7723e60c4f36de7181cddb969e1..ff282997419f87a67443bcf06c5ba5f66c2250bf 100644 (file)
@@ -9,6 +9,7 @@ namespace Friendica\Model;
 use Friendica\BaseObject;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
+use Friendica\Core\Config;
 use Friendica\Database\DBA;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Network;
@@ -33,13 +34,15 @@ class APContact extends BaseObject
                        return false;
                }
 
+               $xrd_timeout = Config::get('system', 'xrd_timeout');
+
                $webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
 
-               $curlResult = Network::curl($webfinger, false, ['accept_content' => 'application/jrd+json,application/json']);
+               $curlResult = Network::curl($webfinger, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/jrd+json,application/json']);
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        $webfinger = 'http://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
 
-                       $curlResult = Network::curl($webfinger, false, ['accept_content' => 'application/jrd+json,application/json']);
+                       $curlResult = Network::curl($webfinger, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/jrd+json,application/json']);
 
                        if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                                return false;