Ticket #3950: 3950.fetch-rss-timeout-addition.patch

wp-includes/rss.php

@@ -375 +375 @@
 }
 require_once( dirname(__FILE__) . '/class-snoopy.php');
 
-function fetch_rss ($url) {
+function fetch_rss ($url, $timeout = false ) {
         // initialize constants
         init();
 
@@ -385 +385 @@
         }
 
         // if cache is disabled
-        if ( !MAGPIE_CACHE_ON ) {
+        if ( !MAGPIE_CACHE_ON || $timeout === 0) {
                 // fetch file, and parse it
                 $resp = _fetch_remote_file( $url );
                 if ( is_success( $resp->status ) ) {
@@ -404 +404 @@
                 // 3. if cached obj fails freshness check, fetch remote
                 // 4. if remote fails, return stale object, or error
 
-                $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+                $cache = new RSSCache( MAGPIE_CACHE_DIR, ( $timeout === false ? MAGPIE_CACHE_AGE : $timeout ) );
 
                 if (MAGPIE_DEBUG and $cache->ERROR) {
                         debug($cache->ERROR, E_USER_WARNING);