friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2100 from annando/bugfix-scrape 

Bugfix: There was an endless loop in the probe_url function ...
This commit is contained in:
Tobias Diekershoff 2015-11-27 06:44:54 +01:00
parent e146b42d15 fa8b4738ee
commit 3bf789d0e3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Scrape.php
View File

@ -17,10 +17,12 @@ function scrape_dfrn($url, $dont_probe = false) {
if(! $s) if(! $s)
return $ret; return $ret;
$probe = probe_url($url); if (!$dont_probe) {
$probe = probe_url($url);
if (isset($probe["addr"])) if (isset($probe["addr"]))
$ret["addr"] = $probe["addr"]; $ret["addr"] = $probe["addr"];
}
$headers = $a->get_curl_headers(); $headers = $a->get_curl_headers();
logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG); logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG);