Merge branch '0.7.x' into 0.8.x

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/ping.php b/lib/ping.php
index d7472b920..3de541e9a 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -50,7 +50,15 @@ function ping_broadcast_notice($notice) {
                                                                    "User-Agent: Laconica/".LACONICA_VERSION."\r\n",
                                                                    'content' => $req)));
             $file = file_get_contents($notify_url, false, $context);
+
+            if ($file === false || mb_strlen($file) == 0) {
+                common_log(LOG_WARNING,
+                           "XML-RPC empty results for ping ($notify_url, $notice->id) ");
+                continue;
+            }
+
             $response = xmlrpc_decode($file);
+
             if (xmlrpc_is_fault($response)) {
                 common_log(LOG_WARNING,
                            "XML-RPC error for ping ($notify_url, $notice->id) ".