Ticket #9005: 9005.patch

wp-cron.php

@@ -11 +11 @@
 
 ignore_user_abort(true);
 
-/**
- * Tell WordPress we are doing the CRON task.
- *
- * @var bool
- */
-define('DOING_CRON', true);
-/** Setup WordPress environment */
-require_once('./wp-load.php');
+if ( defined('ABSPATH') ) {
+        if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') )
+                return;
 
+        /**
+         * Tell WordPress we are doing the CRON task.
+         *
+         * @var bool
+         */
+        define('DOING_CRON', true);
+        wp_redirect(stripslashes($_SERVER['REQUEST_URI']));
+        flush();
+} else {
+        define('DOING_CRON', true);
+
+        /** Setup WordPress environment */
+        require_once('./wp-load.php');
+}
+
 $local_time = time();
 
-$crons = _get_cron_array();
+if ( !isset($crons) ) {
+        if ( false === $crons = _get_cron_array() )
+                die();
+}
+
 $keys = array_keys( $crons );
 
-if (!is_array($crons) || $keys[0] > $local_time) {
-        update_option('doing_cron', 0);
-        return;
-}
+if ( isset($keys[0]) && $keys[0] > $local_time )
+        die();
 
 foreach ($crons as $timestamp  => $cronhooks) {
-
         if ( $timestamp > $local_time )
                 break;
 
@@ -53 +64 @@
         }
 }
 
-update_option('doing_cron', 0);
-
 die();
-
-?>

wp-includes/cron.php

@@ -170 +170 @@
         if ( !$timer_accurate )
                 return;
 
-        //sanity check
-        $crons = _get_cron_array();
-        if ( !is_array($crons) )
-                return;
-
-        $keys = array_keys( $crons );
-        $timestamp =  $keys[0];
-        if ( $timestamp > $local_time )
-                return;
-
         /*
         * multiple processes on multiple web servers can run this code concurrently
         * try to make this as atomic as possible by setting doing_cron switch
         */
         $flag = get_option('doing_cron');
 
-        // clean up potential invalid value resulted from various system chaos
-        if ( $flag != 0 ) {
-                if ( $flag > $local_time + 10*60 || $flag < $local_time - 10*60 ) {
-                        update_option('doing_cron', 0);
-                        $flag = 0;
-                }
-        }
+        if ( $flag > $local_time + 10*60 )
+                $flag = 0;
 
-        //don't run if another process is currently running it
-        if ( $flag > $local_time )
+        // don't run if another process is currently running it or more than once every 60 sec.
+        if ( $flag + 60 > $local_time )
                 return;
 
-        update_option( 'doing_cron', $local_time + 30 );
+        //sanity check
+        $crons = _get_cron_array();
+        if ( !is_array($crons) )
+                return;
 
-        add_action('wp_head', 'spawn_cron_request');
+        $keys = array_keys( $crons );
+        if ( isset($keys[0]) && $keys[0] > $local_time )
+                return;
+
+        update_option( 'doing_cron', $local_time );
+
+        include_once(ABSPATH . 'wp-cron.php');
 }
 
 /**
@@ -213 +207 @@
 function wp_cron() {
 
         // Prevent infinite loops caused by lack of wp-cron.php
-        if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false )
+        if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) )
                 return;
 
-        $crons = _get_cron_array();
-
-        if ( !is_array($crons) )
+        if ( false === $crons = _get_cron_array() )
                 return;
 
+        $local_time = time();
         $keys = array_keys( $crons );
-        if ( isset($keys[0]) && $keys[0] > time() )
+        if ( isset($keys[0]) && $keys[0] > $local_time )
                 return;
 
-        $local_time = time();
         $schedules = wp_get_schedules();
         foreach ( $crons as $timestamp => $cronhooks ) {
                 if ( $timestamp > $local_time ) break;
@@ -370 +362 @@
         return true;
 }
 
-function spawn_cron_request() {
 ?>
-<script type="text/javascript">
-/* <![CDATA[ */
-window.setTimeout(function(){var x;if(window.XMLHttpRequest){x=new XMLHttpRequest();}else{try{x=new ActiveXObject('Msxml2.XMLHTTP');}catch(e){try{x=new ActiveXObject('Microsoft.XMLHTTP');}catch(e){};}}if(x){x.open('GET','<?php echo get_option('siteurl'); ?>/wp-cron.php?'+(new Date()).getTime(), true);x.send('');}},10);
-/* ]]> */
-</script>
-<?php
-}
-
-?>

wp-includes/default-filters.php

@@ -176 +176 @@
 add_action('wp_head', 'wp_generator');
 add_action('wp_footer', 'wp_print_footer_scripts');
 if(!defined('DOING_CRON'))
-        add_action('init', 'wp_cron');
+        add_action('sanitize_comment_cookies', 'wp_cron');
 add_action('do_feed_rdf', 'do_feed_rdf', 10, 1);
 add_action('do_feed_rss', 'do_feed_rss', 10, 1);
 add_action('do_feed_rss2', 'do_feed_rss2', 10, 1);