aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-19 20:59:22 -0700
committerfriendica <info@friendica.com>2012-06-19 20:59:22 -0700
commitb3bf48782fc9cc768645b3e08543799ccc1c743b (patch)
treeeab13dd32ac0a19aae190388d38b5089a776b848
parent1dd33770ed906c5c264166ae592779023ad2f919 (diff)
downloadvolse-hubzilla-b3bf48782fc9cc768645b3e08543799ccc1c743b.tar.gz
volse-hubzilla-b3bf48782fc9cc768645b3e08543799ccc1c743b.tar.bz2
volse-hubzilla-b3bf48782fc9cc768645b3e08543799ccc1c743b.zip
allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed.
-rwxr-xr-xinclude/items.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php
index 05134ef8f..73812978a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1264,6 +1264,11 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
return 3;
}
+ if($contact['term-date'] != '0000-00-00 00:00:00') {
+ logger("dfrn_deliver: $url back from the dead - removing mark for death");
+ unmark_for_death($contact);
+ }
+
$res = parse_xml_string($xml);
return $res->status;