Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / OStatus / scripts / testfeed.php

diff --git a/plugins/OStatus/scripts/testfeed.php b/plugins/OStatus/scripts/testfeed.php
index 316b20b41d9af6bd9ee50149fe0bd737aaa659a4..e22f22ac501abe91143dceac0141ed2cdfacfae5 100644 (file)
--- a/plugins/OStatus/scripts/testfeed.php
+++ b/plugins/OStatus/scripts/testfeed.php
@@ -51,9 +51,11 @@ if (!$sub) {
     exit(1);
 }
 
-$xml = file_get_contents($feedurl);
-if ($xml === false) {
-    print "Bad fetch.\n";
+// Fetch the URL
+try {
+    $xml = HTTPClient::quickGet($feedurl, 'text/html,application/xhtml+xml');
+} catch (Exception $e) {
+    echo sprintf("Could not fetch feedurl %s (%d).\n", $e->getMessage(), $e->getCode());
     exit(1);
 }
 
@@ -85,4 +87,5 @@ if ($skip || $count) {
     }
 }
 
+echo "Calling event StartFeedSubReceive\n";
 Event::handle('StartFeedSubReceive', array($sub, $feed));