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

Workaround for HTTP error 417

Browse source
This commit is contained in:
Michael 2019-09-02 20:39:51 +00:00
parent 046b5a1eac
commit 5ea8116cfd
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Util/Network.php
View file

@ -284,8 +284,8 @@ class Network
$curl_time = Config::get('system', 'curl_timeout', 60); $curl_time = Config::get('system', 'curl_timeout', 60);
curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time)); curl_setopt($ch, CURLOPT_TIMEOUT, intval($curl_time));
} }
/*
if (defined('LIGHTTPD')) { // if (defined('LIGHTTPD')) {
if (empty($headers)) { if (empty($headers)) {
$headers = ['Expect:']; $headers = ['Expect:'];
} else { } else {
@ -293,8 +293,8 @@ class Network
array_push($headers, 'Expect:'); array_push($headers, 'Expect:');
} }
} }
} // }
*/
if (!empty($headers)) { if (!empty($headers)) {
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
} }
@ -336,6 +336,21 @@ class Network
curl_close($ch); curl_close($ch);
$a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack()); $a->getProfiler()->saveTimestamp($stamp1, 'network', System::callstack());
Logger::info('Blubb', ['code' => $curlResponse->getReturnCode()]);
// Some servers don't like the "Expect" header, so we remove it when needed
if ($curlResponse->getReturnCode() == 417) {
$redirects++;
if (empty($headers)) {
$headers = ['Expect:'];
} else {
if (!in_array('Expect:', $headers)) {
array_push($headers, 'Expect:');
}
}
Logger::info('Server responds with 417, applying workaround', ['url' => $url]);
return self::post($url, $params, $headers, $redirects, $timeout);
}
Logger::log('post_url: end ' . $url, Logger::DATA); Logger::log('post_url: end ' . $url, Logger::DATA);