don't parse garbage in phase2 of dfrn_deliver either

diff --git a/include/items.php b/include/items.php
index a3078e39c68a7f94459959984f98065617026cb5..9f693e60d3b1914191209ecba0b663e847b1cb5f 100644 (file)
--- 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;