Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / include / onepoll.php

diff --git a/include/onepoll.php b/include/onepoll.php
index 42bce0f685865a107ada7a8cac20d8be6b04208f..a64922aa323e808576df96416335eaec910622ca 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -25,6 +25,7 @@ function onepoll_run($argv, $argc){
        require_once('include/email.php');
        require_once('include/socgraph.php');
        require_once('include/pidfile.php');
+       require_once('include/queue_fn.php');
 
        load_config('config');
        load_config('system');
@@ -54,6 +55,9 @@ function onepoll_run($argv, $argc){
                return;
        }
 
+       if(was_recently_delayed($contact_id))
+               return;
+
        $d = datetime_convert();
 
        // Only poll from those with suitable relationships,
@@ -452,7 +456,7 @@ function onepoll_run($argv, $argc){
 
        if($xml) {
                logger('poller: received xml : ' . $xml, LOGGER_DATA);
-                       if(! strstr($xml,'<?xml')) {
+                       if((! strstr($xml,'<?xml')) && (! strstr($xml,'<rss'))) {
                        logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
                        $r = q("UPDATE `contact` SET `last-update` = '%s' WHERE `id` = %d LIMIT 1",
                                dbesc(datetime_convert()),