keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some more timeout checks

Browse source
This commit is contained in:
Michael 2017-02-01 21:35:01 +00:00
parent f6e1fbfcaa
commit ef0fb5148c
1 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
include/Probe.php
View file

@ -60,7 +60,12 @@ class Probe {
$xrd_timeout = Config::get('system','xrd_timeout', 20); $xrd_timeout = Config::get('system','xrd_timeout', 20);
$redirects = 0; $redirects = 0;
$xml = fetch_url($ssl_url, false, $redirects, $xrd_timeout, "application/xrd+xml"); $ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$xml = $ret['body'];
$xrd = parse_xml_string($xml, false); $xrd = parse_xml_string($xml, false);
if (!is_object($xrd)) { if (!is_object($xrd)) {
@ -430,7 +435,12 @@ class Probe {
$xrd_timeout = Config::get('system','xrd_timeout', 20); $xrd_timeout = Config::get('system','xrd_timeout', 20);
$redirects = 0; $redirects = 0;
$data = fetch_url($url, false, $redirects, $xrd_timeout, "application/xrd+xml"); $ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$data = $ret['body'];
$xrd = parse_xml_string($data, false); $xrd = parse_xml_string($data, false);
if (!is_object($xrd)) { if (!is_object($xrd)) {
@ -482,9 +492,14 @@ class Probe {
* @return array noscrape data * @return array noscrape data
*/ */
private function poll_noscrape($noscrape, $data) { private function poll_noscrape($noscrape, $data) {
$content = fetch_url($noscrape); $ret = z_fetch_url($noscrape);
if (!$content) if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false; return false;
}
$content = $ret['body'];
if (!$content) {
return false;
}
$json = json_decode($content, true); $json = json_decode($content, true);
if (!is_array($json)) if (!is_array($json))
@ -663,10 +678,14 @@ class Probe {
* @return array hcard data * @return array hcard data
*/ */
private function poll_hcard($hcard, $data, $dfrn = false) { private function poll_hcard($hcard, $data, $dfrn = false) {
$ret = z_fetch_url($hcard);
$content = fetch_url($hcard); if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
if (!$content)
return false; return false;
}
$content = $ret['body'];
if (!$content) {
return false;
}
$doc = new DOMDocument(); $doc = new DOMDocument();
if (!@$doc->loadHTML($content)) if (!@$doc->loadHTML($content))
@ -1035,7 +1054,11 @@ class Probe {
* @return array feed data * @return array feed data
*/ */
private function feed($url, $probe = true) { private function feed($url, $probe = true) {
$feed = fetch_url($url); $ret = z_fetch_url($url);
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
return false;
}
$feed = $ret['body'];
$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true); $feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
if (!$feed_data) { if (!$feed_data) {