aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-02-02 19:28:40 -0800
committerFriendika <info@friendika.com>2011-02-02 19:28:40 -0800
commita8cea3f30cce072e6fc3607e5cfc180b69c07387 (patch)
treec4c495f6ee107d197056a510a73366227b142efb
parent25c2640c17244aeb53020df83455a14ae245e831 (diff)
downloadvolse-hubzilla-a8cea3f30cce072e6fc3607e5cfc180b69c07387.tar.gz
volse-hubzilla-a8cea3f30cce072e6fc3607e5cfc180b69c07387.tar.bz2
volse-hubzilla-a8cea3f30cce072e6fc3607e5cfc180b69c07387.zip
don't try to parse non-xml in dfrn_deliver
-rw-r--r--include/items.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php
index 0c9d54a33..a3078e39c 100644
--- a/include/items.php
+++ b/include/items.php
@@ -800,6 +800,12 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
if(! $xml)
return 3;
+ if(strpos($xml,'<?xml') === false) {
+ logger('dfrn_deliver: no valid XML returned');
+ logger('dfrn_deliver: returned XML: ' . $xml, LOGGER_DATA);
+ return 3;
+ }
+
$res = simplexml_load_string($xml);
if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))