clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fix IHTTPResult::getHeader/s() - Split functionality "getHeader()" and "getHeaders()" analog to IMessageInterface::getHeader/s() - Fix functionality at various places - Adapt CurlResultTest"

Browse Source 
This reverts commit 933ea7c9
This commit is contained in:
Philipp
2020-10-11 23:26:03 +02:00
parent 4b59fe4cf7
commit 069753416d
11 changed files with 28 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Protocol/DFRN.php
View File

@@ -1358,7 +1358,7 @@ class DFRN
return -9; // timed out
}
if (($curl_stat == 503) && $postResult->inHeader('retry-after')) {
if (($curl_stat == 503) && stristr($postResult->getHeader(), 'retry-after')) {
return -10;
}
@@ -1453,7 +1453,7 @@ class DFRN
return -9; // timed out
}
if (($curl_stat == 503) && $postResult->inHeader('retry-after')) {
if (($curl_stat == 503) && (stristr($postResult->getHeader(), 'retry-after'))) {
return -10;
}

6
src/Protocol/OStatus.php
View File

@@ -746,8 +746,7 @@ class OStatus
$xml = '';
if ($curlResult->inHeader('Content-Type') &&
stristr($curlResult->getHeader('Content-Type'), 'application/atom+xml')) {
if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
$xml = $curlResult->getBody();
}
@@ -940,8 +939,7 @@ class OStatus
$xml = '';
if ($curlResult->inHeader('Content-Type') &&
stristr($curlResult->getHeader('Content-Type'), 'application/atom+xml')) {
if (stristr($curlResult->getHeader(), 'Content-Type: application/atom+xml')) {
Logger::log('Directly fetched XML for URI ' . $related_uri, Logger::DEBUG);
$xml = $curlResult->getBody();
}

2
src/Protocol/Salmon.php
View File

@@ -215,7 +215,7 @@ class Salmon
return -1;
}
if (($return_code == 503) && $postResult->inHeader('retry-after')) {
if (($return_code == 503) && (stristr($postResult->getHeader(), 'retry-after'))) {
return -1;
}