Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 16:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't quit if the own host cannot be reached via SSL

Browse source
This commit is contained in:
Michael 2017-05-29 19:14:44 +00:00
parent 47bd3243cd
commit a32de855cc
2 changed files with 53 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Network/Probe.php
View file

@ -58,6 +58,28 @@ class Probe {
return $newdata;
}
/**
* @brief Check if the hostname belongs to the own server
*
* @param string $host The hostname that is to be checked
*
* @return bool Does the testes hostname belongs to the own server?
*/
private function ownHost($host) {
$own_host = get_app()->get_hostname();
$parts = parse_url($host);
if (!isset($parts['scheme'])) {
$parts = parse_url('http://'.$host);
}
if (!isset($parts['host'])) {
return false;
}
return $parts['host'] == $own_host;
}
/**
* @brief Probes for XRD data
*
@ -82,7 +104,7 @@ class Probe {
logger("Probing for ".$host, LOGGER_DEBUG);
$ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
if (($ret['errno'] == CURLE_OPERATION_TIMEDOUT) AND !self::ownHost($ssl_url)) {
logger("Probing timeout for ".$ssl_url, LOGGER_DEBUG);
return false;
}