Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 09:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Curl Response Refactoring

Browse source 
- refactored Network::getCurl()
- replaced every Network::getCur() execution with a Curl Response
This commit is contained in:
Philipp Holzer 2018-10-10 21:20:30 +02:00
parent 7c73e8634c
commit ffbc688797
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
9 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Protocol/Diaspora.php
View file

@ -3089,7 +3089,7 @@ class Diaspora
logger("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
if (!$return_code || (($return_code == 503) && (stristr($postResult->getHeaders(), "retry-after")))) {
if (!$return_code || (($return_code == 503) && (stristr($postResult->getHeader(), "retry-after")))) {
if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::ACCOUNT_TYPE_RELAY)) {
logger("queue message");
// queue message for redelivery

7
src/Protocol/PortableContact.php
View file

@ -86,13 +86,14 @@ class PortableContact
logger('load: ' . $url, LOGGER_DEBUG);
$s = Network::fetchUrl($url);
$fetchresult = Network::fetchUrlFull($url);
$s = $fetchresult->getBody();
logger('load: returns ' . $s, LOGGER_DATA);
logger('load: return code: ' . Network::getCurl()->getCode(), LOGGER_DEBUG);
logger('load: return code: ' . $fetchresult->getReturnCode(), LOGGER_DEBUG);
if ((Network::getCurl()->getCode() > 299) || (! $s)) {
if (($fetchresult->getReturnCode() > 299) || (! $s)) {
return;
}

2
src/Protocol/Salmon.php
View file

@ -193,7 +193,7 @@ class Salmon
return -1;
}
if (($return_code == 503) && (stristr(Network::getCurl()->getHeaders(), 'retry-after'))) {
if (($return_code == 503) && (stristr($postResult->getHeader(), 'retry-after'))) {
return -1;
}