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

Probing sometimes failed / problems with some web servers

Browse source
This commit is contained in:
Michael 2017-08-24 07:56:46 +00:00
parent 6998897a34
commit c09c806f78
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/network.php
View file

@ -107,6 +107,11 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
@curl_setopt($ch, CURLOPT_RANGE, '0-' . $range); @curl_setopt($ch, CURLOPT_RANGE, '0-' . $range);
} }
// Without this setting it seems as if some webservers send compressed content
// This seems to confuse curl so that it shows this uncompressed.
/// @todo We could possibly set this value to "gzip" or something similar
curl_setopt($ch, CURLOPT_ENCODING, '');
if (x($opts, 'headers')) { if (x($opts, 'headers')) {
@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']); @curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
} }

9
src/Network/Probe.php
View file

@ -104,13 +104,10 @@ class Probe {
logger("Probing for ".$host, LOGGER_DEBUG); logger("Probing for ".$host, LOGGER_DEBUG);
$ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => '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) && !self::ownHost($ssl_url)) { if ($ret['success']) {
logger("Probing timeout for ".$ssl_url, LOGGER_DEBUG); $xml = $ret['body'];
return false; $xrd = parse_xml_string($xml, false);
} }
$xml = $ret['body'];
$xrd = parse_xml_string($xml, false);
if (!is_object($xrd)) { if (!is_object($xrd)) {
$ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml')); $ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));