X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3e7fab96d7874067884348df10bbdcdefa4a89ad..e0bf0ae6a149125bedfeaf344114a97d5864e74d:/wp-cron.php?ds=sidebyside

diff --git a/wp-cron.php b/wp-cron.php
index f60ac56e..04953c8d 100644
--- a/wp-cron.php
+++ b/wp-cron.php
@@ -1,35 +1,104 @@
 <?php
+/**
+ * WordPress Cron Implementation for hosts, which do not offer CRON or for which
+ * the user has not set up a CRON job pointing to this file.
+ *
+ * The HTTP request to this file will not slow down the visitor who happens to
+ * visit when the cron job is needed to run.
+ *
+ * @package WordPress
+ */
+
 ignore_user_abort(true);
-define('DOING_CRON', TRUE);
-require_once('./wp-config.php');
 
-if ( $_GET['check'] != wp_hash('187425') )
-	exit;
+if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') )
+	die();
+
+/**
+ * Tell WordPress we are doing the CRON task.
+ *
+ * @var bool
+ */
+define('DOING_CRON', true);
+
+if ( !defined('ABSPATH') ) {
+	/** Set up WordPress environment */
+	require_once('./wp-load.php');
+}
+
+// Uncached doing_cron transient fetch
+function _get_cron_lock() {
+	global $_wp_using_ext_object_cache, $wpdb;
+
+	$value = 0;
+	if ( $_wp_using_ext_object_cache ) {
+		// Skip local cache and force refetch of doing_cron transient in case
+		// another processs updated the cache
+		$value = wp_cache_get( 'doing_cron', 'transient', true );
+	} else {
+		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron' ) );
+		if ( is_object( $row ) )
+			$value = $row->option_value;
+	}
+
+	return $value;
+}
+
+if ( false === $crons = _get_cron_array() )
+	die();
+
+$keys = array_keys( $crons );
+$gmt_time = microtime( true );
 
-if ( get_option('doing_cron') > time() )
-	exit;
+if ( isset($keys[0]) && $keys[0] > $gmt_time )
+	die();
 
-update_option('doing_cron', time() + 30);
+$doing_cron_transient = get_transient( 'doing_cron');
 
-$crons = _get_cron_array();
-$keys = array_keys($crons);
-if (!is_array($crons) || $keys[0] > time())
+// Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock.
+if ( empty( $doing_wp_cron ) ) {
+	if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
+		// Called from external script/job. Try setting a lock.
+		if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) )
+			return;
+		$doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) );
+		set_transient( 'doing_cron', $doing_wp_cron );
+	} else {
+		$doing_wp_cron = $_GET[ 'doing_wp_cron' ];
+	}
+}
+
+// Check lock
+if ( $doing_cron_transient != $doing_wp_cron )
 	return;
-foreach ($crons as $timestamp => $cronhooks) {
-	if ($timestamp > time()) break;
-	foreach ($cronhooks as $hook => $keys) {
-		foreach ($keys as $key => $args) {
-			$schedule = $args['schedule'];
-			if ($schedule != false) {
-				$new_args = array($timestamp, $schedule, $hook, $args['args']);
+
+foreach ( $crons as $timestamp => $cronhooks ) {
+	if ( $timestamp > $gmt_time )
+		break;
+
+	foreach ( $cronhooks as $hook => $keys ) {
+
+		foreach ( $keys as $k => $v ) {
+
+			$schedule = $v['schedule'];
+
+			if ( $schedule != false ) {
+				$new_args = array($timestamp, $schedule, $hook, $v['args']);
 				call_user_func_array('wp_reschedule_event', $new_args);
 			}
-			wp_unschedule_event($timestamp, $hook, $args['args']);
- 			do_action_ref_array($hook, $args['args']);
+
+			wp_unschedule_event( $timestamp, $hook, $v['args'] );
+
+ 			do_action_ref_array( $hook, $v['args'] );
+
+			// If the hook ran too long and another cron process stole the lock, quit.
+			if ( _get_cron_lock() != $doing_wp_cron )
+				return;
 		}
 	}
 }
 
-update_option('doing_cron', 0);
+if ( _get_cron_lock() == $doing_wp_cron )
+	delete_transient( 'doing_cron' );
 
-?>
+die();