MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4770 from annando/dfrn-delivery

Browse source 
Fix: Empty answers in DFRN-Delivery can be okay
This commit is contained in:
Hypolite Petovan 2018-04-07 07:47:02 -04:00 committed by GitHub
parent 232d1009e5 d0dfe2aa64
commit a2e9c7a565
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Protocol/DFRN.php
View file

@ -1361,10 +1361,15 @@ class DFRN
$res = XML::parseString($xml); $res = XML::parseString($xml);
if (empty($res->status)) { if (!isset($res->status)) {
return -11; return -11;
} }
// Possibly old servers had returned an empty value when everything was okay
if (empty($res->status)) {
$res->status = 200;
}
if (!empty($res->message)) { if (!empty($res->message)) {
logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG); logger('Delivery returned status '.$res->status.' - '.$res->message, LOGGER_DEBUG);
} }
@ -1405,7 +1410,7 @@ class DFRN
$fcontact = Diaspora::personByHandle($contact['addr']); $fcontact = Diaspora::personByHandle($contact['addr']);
if (empty($fcontact)) { if (empty($fcontact)) {
logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']); logger('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
return -21; return -22;
} }
$envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch); $envelope = Diaspora::buildMessage($atom, $owner, $contact, $owner['uprvkey'], $fcontact['pubkey'], $public_batch);
@ -1435,7 +1440,7 @@ class DFRN
$res = XML::parseString($xml); $res = XML::parseString($xml);
if (empty($res->status)) { if (empty($res->status)) {
return -11; return -23;
} }
if (!empty($res->message)) { if (!empty($res->message)) {