aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-02-03 04:19:05 -0800
committerFriendika <info@friendika.com>2011-02-03 04:19:05 -0800
commit01cd7cc9f2d811889cebcd410000b03742ded176 (patch)
treeb8275ca839036e34fb0babd0acd59920dbacfa4f
parenta4cbdc241423ca84eff2e888cf5c0a2cecea5f2a (diff)
downloadvolse-hubzilla-01cd7cc9f2d811889cebcd410000b03742ded176.tar.gz
volse-hubzilla-01cd7cc9f2d811889cebcd410000b03742ded176.tar.bz2
volse-hubzilla-01cd7cc9f2d811889cebcd410000b03742ded176.zip
don't parse garbage in phase2 of dfrn_deliver either
-rw-r--r--include/items.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php
index a3078e39c..9f693e60d 100644
--- a/include/items.php
+++ b/include/items.php
@@ -894,6 +894,13 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
if((! $curl_stat) || (! strlen($xml)))
return(-1); // timed out
+
+ if(strpos($xml,'<?xml') === false) {
+ logger('dfrn_deliver: phase 2: no valid XML returned');
+ logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
+ return 3;
+ }
+
$res = simplexml_load_string($xml);
return $res->status;