From 01cd7cc9f2d811889cebcd410000b03742ded176 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 3 Feb 2011 04:19:05 -0800
Subject: [PATCH] don't parse garbage in phase2 of dfrn_deliver either

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

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;