possible workaround for xmlhttp stucking on safari

diff --git a/tt-rss.js b/tt-rss.js
index 215699c5094e8b72ccbe73bf86c18cb137b68633..54e41d912c17ea921c43bfef2d173277ad8f9099 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -187,6 +187,9 @@ function scheduleFeedUpdate(force) {
        if (!xmlhttp_ready(xmlhttp_ctr) && last_refetch < date.getTime() / 1000 - 60) {
                debug("<b>xmlhttp seems to be stuck, aborting</b>");
                xmlhttp_ctr.abort();
+               if (is_safari()) {
+                       xmlhttp_ctr = Ajax.getTransport();
+               }
        }
 
        debug("REFETCH query: " + query_str);

diff --git a/viewfeed.js b/viewfeed.js
index 18264eb63d17bb5d76fa71a788df8eb6cea82879..bef608d3f40d07c7d7bee16612381a3a788bf67d 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -199,6 +199,9 @@ function view(id, feed_id, skip_history) {
                if (!xmlhttp_ready(xmlhttp) && last_article_view < date.getTime() / 1000 - 15) {
                        debug("<b>xmlhttp seems to be stuck at view, aborting</b>");
                        xmlhttp.abort();
+                       if (is_safari()) {
+                               xmlhttp_ctr = Ajax.getTransport();
+                       }
                }
 
                if (xmlhttp_ready(xmlhttp)) {