From a8cea3f30cce072e6fc3607e5cfc180b69c07387 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 2 Feb 2011 19:28:40 -0800
Subject: [PATCH] don't try to parse non-xml in dfrn_deliver

---
 include/items.php | 6 ++++++
 1 file changed, 6 insertions(+)

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)))