site_iri: comparison web/wp-content/plugins/wp-super-cache/wp-cache-phase2.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 <?php
 function wp_cache_phase2() {
-	global $cache_filename, $cache_acceptable_files, $wp_cache_gzip_encoding, $super_cache_enabled, $cache_rebuild_files, $wp_cache_gmt_offset, $wp_cache_blog_charset, $wp_cache_last_gc;
+	global $cache_filename, $cache_acceptable_files, $wp_cache_gzip_encoding, $super_cache_enabled, $cache_rebuild_files, $wp_cache_last_gc;
-	global $cache_max_time, $wp_cache_not_logged_in, $wp_cache_request_uri, $super_cache_enabled;
+	global $cache_max_time, $wp_cache_request_uri, $super_cache_enabled, $wp_cache_object_cache, $cache_time_interval, $wp_cache_no_cache_for_get;
+	global $cache_enabled, $wp_cache_gmt_offset, $wp_cache_blog_charset, $cache_schedule_type, $cache_scheduled_time, $cache_schedule_interval;
+	if ( $cache_enabled == false ) {
+		if ( isset( $wp_super_cache_debug ) && $wp_super_cache_debug ) wp_cache_debug( "Caching disabled! quiting!", 1 );
+		return false;
+	}
 	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'In WP Cache Phase 2', 5 );
-	$wp_cache_gmt_offset   = get_option( 'gmt_offset' ); // caching for later use when wpdb is gone. http://wordpress.org/support/topic/224349
+	$wp_cache_gmt_offset = get_option( 'gmt_offset' ); // caching for later use when wpdb is gone. http://wordpress.org/support/topic/224349
 	$wp_cache_blog_charset = get_option( 'blog_charset' );
 	wp_cache_mutex_init();
 	if(function_exists('add_action') && ( !defined( 'WPLOCKDOWN' ) || ( defined( 'WPLOCKDOWN' ) && constant( 'WPLOCKDOWN' ) == '0' ) ) ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Setting up WordPress actions', 5 );
+		add_action( 'template_redirect', 'wp_super_cache_query_vars' );
 		// Post ID is received
+		add_action('wp_trash_post', 'wp_cache_post_edit', 0);
 		add_action('publish_post', 'wp_cache_post_edit', 0);
 		add_action('edit_post', 'wp_cache_post_change', 0); // leaving a comment called edit_post
 		add_action('delete_post', 'wp_cache_post_edit', 0);
 		add_action('publish_phone', 'wp_cache_post_edit', 0);
 		// Coment ID is received
 		add_action('edit_comment', 'wp_cache_get_postid_from_comment', 99);
 		add_action('wp_set_comment_status', 'wp_cache_get_postid_from_comment', 99, 2);
 		// No post_id is available
 		add_action('switch_theme', 'wp_cache_no_postid', 99);
 		add_action('edit_user_profile_update', 'wp_cache_no_postid', 99);
+		add_action( 'wp_update_nav_menu', 'wp_cache_clear_cache_on_menu' );
 		add_action('wp_cache_gc','wp_cache_gc_cron');
+		add_action( 'clean_post_cache', 'wp_cache_post_edit' );
+		add_filter( 'supercache_filename_str', 'wp_cache_check_mobile' );
+		add_action( 'wp_cache_gc_watcher', 'wp_cache_gc_watcher' );
 		do_cacheaction( 'add_cacheaction' );
+	}
+	if ( $wp_cache_no_cache_for_get && false == empty( $_GET ) && false == defined( 'DOING_CRON' ) ) {
+		if ( isset( $wp_super_cache_debug ) && $wp_super_cache_debug ) wp_cache_debug( "Non empty GET request. Caching disabled on settings page.", 1 );
+		return false;
 	}
 	if ( is_admin() ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching wp-admin requests.', 5 );
 		return false;
 	if ( $_SERVER["REQUEST_METHOD"] == 'POST' || !empty( $_POST ) || get_option( 'gzipcompression' ) ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching POST request.', 5 );
 		return false;
 	}
+	if ( $wp_cache_object_cache && !empty( $_GET ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching GET request while object cache storage enabled.', 5 );
+		return false;
+	}
 	if ( isset( $_GET[ 'preview' ] ) ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching preview post.', 2 );
 		return false;
 	}
 	if ( !empty( $_GET ) ) {
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Supercache caching disabled. Non empty GET request.', 5 );
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Supercache caching disabled. Only using wp-cache. Non empty GET request.', 5 );
 		$super_cache_enabled = false;
-	}
-	if ( $wp_cache_not_logged_in && is_user_logged_in() && !is_feed() && !is_admin() ) {
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) {
-			wp_cache_debug( 'not caching for logged in user', 5 );
-			register_shutdown_function( 'wpcache_logged_in_message' );
-		}
-		return false;
 	}
 	$script = basename($_SERVER['PHP_SELF']);
 	if (!in_array($script, $cache_acceptable_files) && wp_cache_is_rejected($wp_cache_request_uri)) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'URI rejected. Not Caching', 2 );
 	// restore old supercache file temporarily
 	if( $super_cache_enabled && $cache_rebuild_files ) {
 		$user_info = wp_cache_get_cookies_values();
 		$do_cache = apply_filters( 'do_createsupercache', $user_info );
-		if( $user_info == '' || $do_cache === true ) {
+		if( $user_info == '' || $do_cache === true )
-			$dir = get_current_url_supercache_dir();
+			wpcache_do_rebuild( get_current_url_supercache_dir() );
-			$files_to_check = array( $dir . 'index.html', $dir . 'index.html.gz' );
+	}
-			foreach( $files_to_check as $cache_file ) {
-				if( !@file_exists( $cache_file . '.needs-rebuild' ) )
+	schedule_wp_gc();
-					continue;
+}
-				$mtime = @filemtime($cache_file . '.needs-rebuild');
-				if( $mtime && (time() - $mtime) < 30 ) {
+function wpcache_do_rebuild( $dir ) {
-					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Rebuild file renamed to cache file temporarily", 3 );
+	$dir = trailingslashit( $dir );
-					@rename( $cache_file . '.needs-rebuild', $cache_file );
+	$files_to_check = get_all_supercache_filenames( $dir );
-				}
+	foreach( $files_to_check as $cache_file ) {
-				// cleanup old files or if rename fails
+		$cache_file = $dir . $cache_file;
-				if( @file_exists( $cache_file . '.needs-rebuild' ) ) {
+		if( !@file_exists( $cache_file . '.needs-rebuild' ) )
-					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Rebuild file deleted", 3 );
+			continue;
-					@unlink( $cache_file . '.needs-rebuild' );
+		$mtime = @filemtime($cache_file . '.needs-rebuild');
-				}
+		if( $mtime && (time() - $mtime) < 30 ) {
-			}
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Rebuild file renamed to cache file temporarily: $cache_file", 3 );
-		}
+			@rename( $cache_file . '.needs-rebuild', $cache_file );
-	}
+		}
+		// cleanup old files or if rename fails
-	if( !isset( $cache_max_time ) )
+		if( @file_exists( $cache_file . '.needs-rebuild' ) ) {
-		$cache_max_time = 600;
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Rebuild file deleted: {$cache_file}.needs-rebuild", 3 );
-	$last_gc = get_option( "wpsupercache_gc_time" );
+			@unlink( $cache_file . '.needs-rebuild' );
-	if( !$last_gc ) {
-		update_option( 'wpsupercache_gc_time', time() );
-	}
-	$next_gc = $cache_max_time < 1800 ? $cache_max_time : 600;
-	if( $last_gc < ( time() - $next_gc ) ) {
-		update_option( 'wpsupercache_gc_time', time() );
-		global $wp_cache_shutdown_gc;
-		if( !isset( $wp_cache_shutdown_gc ) || $wp_cache_shutdown_gc == 0 ) {
-			if(!wp_next_scheduled('wp_cache_gc')) {
-				wp_schedule_single_event(time() + 10 , 'wp_cache_gc');
-				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'scheduled wp_cache_gc for 10 seconds time.', 5 );
-			}
-		} else {
-			global $time_to_gc_cache;
-			$time_to_gc_cache = 1; // tell the "shutdown gc" to run!
 		}
 	}
 }
 function wpcache_logged_in_message() {
 		global $cache_rejected_user_agent;
 		if (!function_exists('apache_request_headers')) return false;
 		$headers = apache_request_headers();
 		if (!isset($headers["User-Agent"])) return false;
+		if ( false == is_array( $cache_rejected_user_agent ) )
+			return false;
 		foreach ($cache_rejected_user_agent as $expr) {
 			if (strlen($expr) > 0 && stristr($headers["User-Agent"], $expr))
 				return true;
 		}
 		return false;
 	$auto_rejected = array( '/wp-admin/', 'xmlrpc.php', 'wp-app.php' );
 	foreach( $auto_rejected as $u ) {
 		if( strstr( $uri, $u ) )
 			return true; // we don't allow caching of wp-admin for security reasons
 	}
-	foreach ($cache_rejected_uri as $expr) {
+	if ( false == is_array( $cache_rejected_uri ) )
-		if( $expr != '' && preg_match( "~$expr~", $uri ) )
+		return false;
+	foreach ( $cache_rejected_uri as $expr ) {
+		if( $expr != '' && @preg_match( "~$expr~", $uri ) )
 			return true;
 	}
 	return false;
 }
 function wp_cache_mutex_init() {
-	global $use_flock, $mutex, $cache_path, $mutex_filename, $sem_id, $blog_cache_dir, $wp_cache_mutex_disabled;
+	global $mutex, $wp_cache_mutex_disabled, $use_flock, $blog_cache_dir, $mutex_filename, $sem_id;
-	if( isset( $wp_cache_mutex_disabled ) && $wp_cache_mutex_disabled )
+	if( isset( $wp_cache_mutex_disabled) && $wp_cache_mutex_disabled )
 		return true;
-	if(!is_bool($use_flock)) {
+	if( !is_bool( $use_flock ) ) {
 		if(function_exists('sem_get'))
 			$use_flock = false;
 		else
 			$use_flock = true;
 	}
 	$mutex = false;
-	if ($use_flock)  {
+	if ($use_flock )  {
+		setup_blog_cache_dir();
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Created mutex lock on filename: {$blog_cache_dir}{$mutex_filename}", 5 );
-		$mutex = @fopen($blog_cache_dir . $mutex_filename, 'w');
+		$mutex = @fopen( $blog_cache_dir . $mutex_filename, 'w' );
 	} else {
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Created mutex lock on semaphore: $sem_id", 5 );
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Created mutex lock on semaphore: {$sem_id}", 5 );
-		$mutex = @sem_get($sem_id, 1, 0644 | IPC_CREAT, 1);
+		$mutex = @sem_get( $sem_id, 1, 0644 | IPC_CREAT, 1 );
 	}
 }
 function wp_cache_writers_entry() {
-	global $use_flock, $mutex, $cache_path, $mutex_filename, $wp_cache_mutex_disabled;
+	global $mutex, $wp_cache_mutex_disabled, $use_flock;
 	if( isset( $wp_cache_mutex_disabled ) && $wp_cache_mutex_disabled )
 		return true;
 	if( !$mutex ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "(writers entry) mutex lock not created. not caching.", 2 );
 		return false;
 	}
-	if ($use_flock) {
+	if ( $use_flock ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "grabbing lock using flock()", 5 );
 		flock($mutex,  LOCK_EX);
 	} else {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "grabbing lock using sem_acquire()", 5 );
 		sem_acquire($mutex);
 	return true;
 }
 function wp_cache_writers_exit() {
-	global $use_flock, $mutex, $cache_path, $mutex_filename, $wp_cache_mutex_disabled;
+	global $mutex, $wp_cache_mutex_disabled, $use_flock;
 	if( isset( $wp_cache_mutex_disabled ) && $wp_cache_mutex_disabled )
 		return true;
 	if( !$mutex ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "(writers exit) mutex lock not created. not caching.", 2 );
 		return false;
 	}
-	if ($use_flock) {
+	if ( $use_flock ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "releasing lock using flock()", 5 );
 		flock($mutex,  LOCK_UN);
 	} else {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "releasing lock using sem_release()", 5 );
 		sem_release($mutex);
 	}
 }
-function get_current_url_supercache_dir() {
+function wp_super_cache_query_vars() {
-	global $cached_direct_pages, $cache_path, $wp_cache_request_uri;
+	global $wp_super_cache_query;
-	$uri = preg_replace('/[ <>\'\"\r\n\t\(\)]/', '', str_replace( '/index.php', '/', str_replace( '..', '', preg_replace("/(\?.*)?$/", '', $wp_cache_request_uri ) ) ) );
+	if ( is_search() )
-	$uri = str_replace( '\\', '', $uri );
+		$wp_super_cache_query[ 'is_search' ] = 1;
-	$dir = strtolower(preg_replace('/:.*$/', '',  $_SERVER["HTTP_HOST"])) . $uri; // To avoid XSS attacks
+	if ( is_page() )
-	$dir = apply_filters( 'supercache_dir', $dir );
+		$wp_super_cache_query[ 'is_page' ] = 1;
-	$dir = trailingslashit( $cache_path . 'supercache/' . $dir );
+	if ( is_archive() )
-	if( is_array( $cached_direct_pages ) && in_array( $_SERVER[ 'REQUEST_URI' ], $cached_direct_pages ) ) {
+		$wp_super_cache_query[ 'is_archive' ] = 1;
-		$dir = trailingslashit( ABSPATH . $uri );
+	if ( is_tag() )
-	}
+		$wp_super_cache_query[ 'is_tag' ] = 1;
-	$dir = str_replace( '//', '/', $dir );
+	if ( is_single() )
-	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "supercache dir: $dir", 5 );
+		$wp_super_cache_query[ 'is_single' ] = 1;
-	return $dir;
+	if ( is_category() )
+		$wp_super_cache_query[ 'is_category' ] = 1;
+	if ( is_front_page() )
+		$wp_super_cache_query[ 'is_front_page' ] = 1;
+	if ( is_home() )
+		$wp_super_cache_query[ 'is_home' ] = 1;
+	if ( is_author() )
+		$wp_super_cache_query[ 'is_author' ] = 1;
+	if ( is_feed() )
+		$wp_super_cache_query[ 'is_feed' ] = 1;
 }
 function wp_cache_ob_callback( $buffer ) {
-	global $wp_cache_pages;
+	global $wp_cache_pages, $wp_query, $wp_super_cache_query;
-	if( defined( 'DONOTCACHEPAGE' ) )
+	$buffer = apply_filters( 'wp_cache_ob_callback_filter', $buffer );
+	if( defined( 'DONOTCACHEPAGE' ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'DONOTCACHEPAGE defined. Caching disabled.', 2 );
 		return $buffer;
+	}
+	if ( isset( $wp_cache_pages[ 'single' ] ) && $wp_cache_pages[ 'single' ] == 1 && isset( $wp_super_cache_query[ 'is_single' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching single post.', 2 );
+		return $buffer;
+	} elseif ( isset( $wp_cache_pages[ 'pages' ] ) && $wp_cache_pages[ 'pages' ] == 1 && isset( $wp_super_cache_query[ 'is_page' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching single page.', 2 );
+		return $buffer;
+	} elseif ( isset( $wp_cache_pages[ 'archives' ] ) && $wp_cache_pages[ 'archives' ] == 1 && isset( $wp_super_cache_query[ 'is_archive' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching archive page.', 2 );
+		return $buffer;
+	} elseif ( isset( $wp_cache_pages[ 'tag' ] ) && $wp_cache_pages[ 'tag' ] == 1 && isset( $wp_super_cache_query[ 'is_tag' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching tag page.', 2 );
+		return $buffer;
+	} elseif ( isset( $wp_cache_pages[ 'category' ] ) && $wp_cache_pages[ 'category' ] == 1 && isset( $wp_super_cache_query[ 'is_category' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching category page.', 2 );
+		return $buffer;
+	} elseif ( isset( $wp_cache_pages[ 'frontpage' ] ) && $wp_cache_pages[ 'frontpage' ] == 1 && isset( $wp_super_cache_query[ 'is_front_page' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching front page.', 2 );
+		return $buffer;
+	} elseif ( isset( $wp_cache_pages[ 'home' ] ) && $wp_cache_pages[ 'home' ] == 1 && isset( $wp_super_cache_query[ 'is_home' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching home page.', 2 );
+		return $buffer;
+	} elseif ( isset( $wp_cache_pages[ 'search' ] ) && $wp_cache_pages[ 'search' ] == 1 && isset( $wp_super_cache_query[ 'is_search' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching search page.', 2 );
+		return $buffer;
+	} elseif ( isset( $wp_cache_pages[ 'author' ] ) && $wp_cache_pages[ 'author' ] == 1 && isset( $wp_super_cache_query[ 'is_author' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching author page.', 2 );
+		return $buffer;
+	} elseif ( isset( $wp_cache_pages[ 'feed' ] ) && $wp_cache_pages[ 'feed' ] == 1 && isset( $wp_super_cache_query[ 'is_feed' ] ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching feed.', 2 );
+		return $buffer;
+	}
+	if ( !isset( $wp_query ) )
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'wp_cache_ob_callback: WARNING! $query not defined but the plugin has worked around that problem.', 4 );
 	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Output buffer callback', 4 );
-	if ( isset( $wp_cache_pages[ 'single' ] ) && $wp_cache_pages[ 'single' ] == 1 && is_single() ) {
-		return $buffer;
-	} elseif ( isset( $wp_cache_pages[ 'pages' ] ) && $wp_cache_pages[ 'pages' ] == 1 && is_page() ) {
-		return $buffer;
-	} elseif ( isset( $wp_cache_pages[ 'archives' ] ) && $wp_cache_pages[ 'archives' ] == 1 && is_archive() ) {
-		return $buffer;
-	} elseif ( isset( $wp_cache_pages[ 'tag' ] ) && $wp_cache_pages[ 'tag' ] == 1 && is_tag() ) {
-		return $buffer;
-	} elseif ( isset( $wp_cache_pages[ 'category' ] ) && $wp_cache_pages[ 'category' ] == 1 && is_category() ) {
-		return $buffer;
-	} elseif ( isset( $wp_cache_pages[ 'frontpage' ] ) && $wp_cache_pages[ 'frontpage' ] == 1 && is_front_page() ) {
-		return $buffer;
-	} elseif ( isset( $wp_cache_pages[ 'home' ] ) && $wp_cache_pages[ 'home' ] == 1 && is_home() ) {
-		return $buffer;
-	} elseif ( isset( $wp_cache_pages[ 'search' ] ) && $wp_cache_pages[ 'search' ] == 1 && is_search() ) {
-		return $buffer;
-	} elseif ( isset( $wp_cache_pages[ 'feed' ] ) && $wp_cache_pages[ 'feed' ] == 1 && is_feed() ) {
-		return $buffer;
-	}
 	$buffer = &wp_cache_get_ob( $buffer );
 	wp_cache_shutdown_callback();
 	return $buffer;
 }
+function wp_cache_append_tag( &$buffer ) {
+	global $wp_cache_gmt_offset, $wp_super_cache_comments;
+	global $cache_enabled, $super_cache_enabled;
+	if ( false == isset( $wp_super_cache_comments ) )
+		$wp_super_cache_comments = 1;
+	if ( $wp_super_cache_comments == 0 )
+		return false;
+	$timestamp = gmdate('Y-m-d H:i:s', (time() + ( $wp_cache_gmt_offset * 3600)));
+	if ( $cache_enabled || $super_cache_enabled ) {
+		$buffer .= "\n<!-- Cached page generated by WP-Super-Cache on $timestamp -->\n";
+	} else {
+		$buffer .= "\n<!-- Live page served on $timestamp -->\n";
+	}
+}
+function wp_cache_add_to_buffer( &$buffer, $text ) {
+	global $wp_super_cache_comments;
+	if ( false == isset( $wp_super_cache_comments ) )
+		$wp_super_cache_comments = 1;
+	if ( $wp_super_cache_comments == 0 )
+		return false;
+	$buffer .= "\n<!-- $text -->";
+}
 function wp_cache_get_ob(&$buffer) {
-	global $cache_path, $cache_filename, $meta_file, $wp_start_time, $supercachedir;
+	global $cache_enabled, $cache_path, $cache_filename, $meta_file, $wp_start_time, $supercachedir;
 	global $new_cache, $wp_cache_meta, $file_expired, $blog_id, $cache_compression;
 	global $wp_cache_gzip_encoding, $super_cache_enabled, $cached_direct_pages;
-	global $wp_cache_404, $gzsize, $supercacheonly, $wp_cache_gzip_first, $wp_cache_gmt_offset;
+	global $wp_cache_404, $gzsize, $supercacheonly;
 	global $blog_cache_dir, $wp_cache_request_uri, $wp_supercache_cache_list;
+	global $wp_cache_not_logged_in, $wp_cache_object_cache, $cache_max_time;
+	global $wp_cache_is_home, $wp_cache_front_page_checks;
 	$new_cache = true;
 	$wp_cache_meta = '';
 	/* Mode paranoic, check for closing tags
 	 * we avoid caching incomplete files */
 	if ( $buffer == '' ) {
 		$new_cache = false;
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) {
 			wp_cache_debug( "Buffer is blank. Output buffer may have been corrupted by another plugin or this is a redirected URL. Look for text 'ob_start' in the files of your plugins directory.", 2 );
-			$buffer .= "\n<!-- Page not cached by WP Super Cache. Blank Page. Check output buffer usage by plugins. -->\n";
+			wp_cache_add_to_buffer( $buffer, "Page not cached by WP Super Cache. Blank Page. Check output buffer usage by plugins." );
 		}
 	}
 	if ( $wp_cache_404 && false == apply_filters( 'wpsupercache_404', false ) ) {
 		$new_cache = false;
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) {
 			wp_cache_debug( "404 file not found not cached", 2 );
-			$buffer .= "\n<!-- Page not cached by WP Super Cache. 404. -->\n";
+			wp_cache_add_to_buffer( $buffer, "Page not cached by WP Super Cache. 404." );
 		}
 	}
-	if (!preg_match('/(<\/html>|<\/rss>|<\/feed>)/i',$buffer) ) {
+	if ( !preg_match( apply_filters( 'wp_cache_eof_tags', '/(<\/html>|<\/rss>|<\/feed>|<\/urlset|<\?xml)/i' ), $buffer ) ) {
 		$new_cache = false;
 		if( false === strpos( $_SERVER[ 'REQUEST_URI' ], 'robots.txt' ) ) {
 			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) {
 				wp_cache_debug( "No closing html tag. Not caching.", 2 );
-				$buffer .= "\n<!-- Page not cached by WP Super Cache. No closing HTML tag. Check your theme. -->\n";
+				wp_cache_add_to_buffer( $buffer, "Page not cached by WP Super Cache. No closing HTML tag. Check your theme." );
 			}
 		} else {
 			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "robots.txt detected. Not caching.", 2 );
 		}
 	}
 	if( !$new_cache )
 		return $buffer;
 	$duration = wp_cache_microtime_diff($wp_start_time, microtime());
 	$duration = sprintf("%0.3f", $duration);
-	$buffer .= "\n<!-- Dynamic page generated in $duration seconds. -->\n";
+	wp_cache_add_to_buffer( $buffer, "Dynamic page generated in $duration seconds." );
 	if( !wp_cache_writers_entry() ) {
-		$buffer .= "\n<!-- Page not cached by WP Super Cache. Could not get mutex lock. -->\n";
+		wp_cache_add_to_buffer( $buffer, "Page not cached by WP Super Cache. Could not get mutex lock." );
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Could not get mutex lock. Not caching.", 1 );
 		return $buffer;
 	}
+	if ( $wp_cache_not_logged_in && is_feed() ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Feed detected. Writing legacy cache files.", 5 );
+		$wp_cache_not_logged_in = false;
+	}
+	$home_url = parse_url( trailingslashit( get_bloginfo( 'url' ) ) );
 	$dir = get_current_url_supercache_dir();
-	$supercachedir = $cache_path . 'supercache/' . preg_replace('/:.*$/', '',  $_SERVER["HTTP_HOST"]);
+	$supercachedir = $cache_path . 'supercache/' . preg_replace('/:.*$/', '',  $home_url[ 'host' ]);
 	if( !empty( $_GET ) || is_feed() || ( $super_cache_enabled == true && is_dir( substr( $supercachedir, 0, -1 ) . '.disabled' ) ) ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Supercache disabled: GET or feed detected or disabled by config.", 2 );
 		$super_cache_enabled = false;
 	}
 	$tmp_wpcache_filename = $cache_path . uniqid( mt_rand(), true ) . '.tmp';
-	// Don't create wp-cache files for anon users
 	$supercacheonly = false;
-	if( $super_cache_enabled && wp_cache_get_cookies_values() == '' ) {
+	if( $super_cache_enabled ) {
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Anonymous user detected. Only creating Supercache file.", 3 );
+		if ( wp_cache_get_cookies_values() == '' && empty( $_GET ) ) {
-		$supercacheonly = true;
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Anonymous user detected. Only creating Supercache file.", 3 );
-	}
+			$supercacheonly = true;
+		}
-	if( !$supercacheonly ) {
+	}
-		if ( !@file_exists( $blog_cache_dir . $cache_filename ) || ( @file_exists( $blog_cache_dir . $cache_filename ) && ( time() - @filemtime( $blog_cache_dir . $cache_filename ) ) > 5 ) ) {
+	$cache_error = '';
+	if ( $wp_cache_not_logged_in && wp_cache_get_cookies_values() != '' ) {
+		$super_cache_enabled = false;
+		$cache_enabled = false;
+		$cache_error = 'Not caching requests by known users. (See Advanced Settings page)';
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Not caching for known user.', 5 );
+	}
+	if ( $wp_cache_object_cache ) { // half on mode when using the object cache
+		if ( wp_cache_get_cookies_values() != '' ) {
+			$cache_enabled = false;
+			$cache_error = 'Known User and using object. Only anonymous users cached.';
+		}
+		$super_cache_enabled = false;
+		$supercacheonly = false;
+		wp_cache_init(); // PHP5 destroys objects during shutdown
+	}
+	if ( !$cache_enabled ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Cache is not enabled. Sending buffer to browser.', 5 );
+		wp_cache_writers_exit();
+		wp_cache_add_to_buffer( $buffer, "Page not cached by WP Super Cache. Check your settings page. $cache_error" );
+			return $buffer;
+	}
+	if( @is_dir( $dir ) == false )
+		@wp_mkdir_p( $dir );
+	$fr = $fr2 = $gz = false;
+	// Open wp-cache cache file
+	if ( !$supercacheonly ) {
+		if ( false == $wp_cache_object_cache ) {
 			$fr = @fopen($tmp_wpcache_filename, 'w');
 			if (!$fr) {
 				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Error. Supercache could not write to " . str_replace( ABSPATH, '', $cache_path ) . $cache_filename, 1 );
-				$buffer .= "<!-- File not cached! Super Cache Couldn't write to: " . str_replace( ABSPATH, '', $cache_path ) . $cache_filename . " -->\n";
+				wp_cache_add_to_buffer( $buffer, "File not cached! Super Cache Couldn't write to: " . str_replace( ABSPATH, '', $cache_path ) . $cache_filename );
+				wp_cache_writers_exit();
 				return $buffer;
 			}
 		}
-	}
+	} else {
-	if( $super_cache_enabled ) {
 		$user_info = wp_cache_get_cookies_values();
 		$do_cache = apply_filters( 'do_createsupercache', $user_info );
-		if( $user_info == '' || $do_cache === true ) {
+		if ( $super_cache_enabled && ( $user_info == '' || $do_cache === true ) ) {
-			if( @is_dir( $dir ) == false )
+			$cache_fname = $dir . supercache_filename();
-				@wp_mkdir_p( $dir );
-			$cache_fname = "{$dir}index.html";
 			$tmp_cache_filename = $dir . uniqid( mt_rand(), true ) . '.tmp';
-			if ( !@file_exists( $cache_fname ) || ( @file_exists( $cache_fname ) && ( time() - @filemtime( $cache_fname ) ) > 5 ) ) {
+			$fr2 = @fopen( $tmp_cache_filename, 'w' );
-				$fr2 = @fopen( $tmp_cache_filename, 'w' );
+			if ( !$fr2 ) {
-				if (!$fr2) {
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Error. Supercache could not write to " . str_replace( ABSPATH, '', $tmp_cache_filename ), 1 );
-					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Error. Supercache could not write to " . str_replace( ABSPATH, '', $tmp_cache_filename ), 1 );
+				wp_cache_add_to_buffer( $buffer, "File not cached! Super Cache Couldn't write to: " . str_replace( ABSPATH, '', $tmp_cache_filename ) );
-					$buffer .= "<!-- File not cached! Super Cache Couldn't write to: " . str_replace( ABSPATH, '', $tmp_cache_filename ) . " -->\n";
+				@fclose( $fr );
+				@unlink( $tmp_wpcache_filename );
+				wp_cache_writers_exit();
+				return $buffer;
+			} elseif ( $cache_compression ) {
+				$gz = @fopen( $tmp_cache_filename . ".gz", 'w');
+				if (!$gz) {
+					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Error. Supercache could not write to " . str_replace( ABSPATH, '', $tmp_cache_filename ) . ".gz", 1 );
+					wp_cache_add_to_buffer( $buffer, "File not cached! Super Cache Couldn't write to: " . str_replace( ABSPATH, '', $tmp_cache_filename ) . ".gz" );
 					@fclose( $fr );
 					@unlink( $tmp_wpcache_filename );
+					@fclose( $fr2 );
+					@unlink( $tmp_cache_filename );
+					wp_cache_writers_exit();
 					return $buffer;
-				} elseif( $cache_compression ) {
+				}
-					$gz = @fopen( $tmp_cache_filename . ".gz", 'w');
+			}
-					if (!$gz) {
+		}
-						if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Error. Supercache could not write to " . str_replace( ABSPATH, '', $tmp_cache_filename ) . ".gz", 1 );
+	}
-						$buffer .= "<!-- File not cached! Super Cache Couldn't write to: " . str_replace( ABSPATH, '', $tmp_cache_filename ) . ".gz -->\n";
-						@fclose( $fr );
+	$added_cache = 0;
-						@unlink( $tmp_wpcache_filename );
+	$oc_key = get_oc_key();
-						@fclose( $fr2 );
+	if ( preg_match( '/<!--mclude|<!--mfunc|<!--dynamic-cached-content-->/', $buffer ) ) { //Dynamic content
-						@unlink( $tmp_cache_filename );
-						return $buffer;
-					}
-				}
-			}
-		}
-	}
-	if (preg_match('/<!--mclude|<!--mfunc/', $buffer)) { //Dynamic content
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Dynamic content found in buffer.", 4 );
 		$store = preg_replace('|<!--mclude (.*?)-->(.*?)<!--/mclude-->|is',
 				"<!--mclude-->\n<?php include_once('" . ABSPATH . "$1'); ?>\n<!--/mclude-->", $buffer);
 		$store = preg_replace('|<!--mfunc (.*?)-->(.*?)<!--/mfunc-->|is',
 				"<!--mfunc-->\n<?php $1 ;?>\n<!--/mfunc-->", $store);
-		$store = apply_filters( 'wpsupercache_buffer', $store );
+		$store = preg_replace('|<!--dynamic-cached-content-->(.*?)<!--(.*?)--><!--/dynamic-cached-content-->|is',
+				"<!--dynamic-cached-content-->\n<?php$2?>\n<!--/dynamic-cached-content-->", $store);
 		$wp_cache_meta[ 'dynamic' ] = true;
 		/* Clean function calls in tag */
 		$buffer = preg_replace('|<!--mclude (.*?)-->|is', '<!--mclude-->', $buffer);
 		$buffer = preg_replace('|<!--mfunc (.*?)-->|is', '<!--mfunc-->', $buffer);
-		if( $fr )
+		$buffer = preg_replace('|<!--dynamic-cached-content-->(.*?)<!--(.*?)--><!--/dynamic-cached-content-->|is',
-			fputs($fr, $store);
+				"<!--dynamic-cached-content-->$1<!--/dynamic-cached-content-->", $buffer);
-		if( $fr2 )
+		$store = apply_filters( 'wpsupercache_buffer', $store );
-			fputs($fr2, $store . '<!-- super cache -->' );
+		// Append WP Super Cache or Live page comment tag
-		if( $gz )
+		wp_cache_append_tag($buffer);
-			fputs($gz, gzencode( $store . '<!-- super cache gz -->', 1, FORCE_GZIP ) );
+		wp_cache_append_tag($store);
+		global $wp_super_cache_late_init;
+		if ( false == isset( $wp_super_cache_late_init ) || ( isset( $wp_super_cache_late_init ) && $wp_super_cache_late_init == 0 ) )
+			wp_cache_add_to_buffer( $buffer, 'Super Cache dynamic page detected but $wp_super_cache_late_init not set. See the readme.txt for further details.' );
+		if ( false == $wp_cache_object_cache ) {
+			if( $fr ) { // legacy caching
+				fputs($fr, $store);
+			} elseif ( isset( $fr2 ) ) { // supercache active
+				$php_fname = "{$dir}" . supercache_filename() . ".php";
+				$tmp_php_filename = $dir . uniqid( mt_rand(), true ) . '.tmp';
+				$php_fd = @fopen( $tmp_php_filename, 'w' );
+				if ( !$php_fd ) {
+					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Error. Supercache could not write to " . str_replace( ABSPATH, '', $tmp_php_filename ), 1 );
+					wp_cache_add_to_buffer( $buffer, "File not cached! Super Cache couldn't write to: " . str_replace( ABSPATH, '', $tmp_php_filename ) );
+					@fclose( $php_fd );
+					@unlink( $tmp_php_filename );
+					wp_cache_writers_exit();
+					return $buffer;
+				}
+				fputs( $php_fd, $store );
+			}
+		} else {
+			wp_cache_set( $oc_key, $store, 'supercache', $cache_max_time );
+		}
+		if ( $cache_compression && $wp_cache_gzip_encoding ) {
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Gzipping dynamic buffer.", 5 );
+			wp_cache_add_to_buffer( $buffer, "Compression = gzip" );
+			$gzdata = gzencode( $buffer, 6, FORCE_GZIP );
+			$gzsize = function_exists( 'mb_strlen' ) ? mb_strlen( $gzdata, '8bit' ) : strlen( $gzdata );
+		}
 	} else {
 		$buffer = apply_filters( 'wpsupercache_buffer', $buffer );
-		$buffer .= "<!-- Cached page generated by WP-Super-Cache on " . gmdate('Y-m-d H:i:s', (time() + ( $wp_cache_gmt_offset * 3600)))  . " -->\n";
+		// Append WP Super Cache or Live page comment tag
+		wp_cache_append_tag($buffer);
 		if( $gz || $wp_cache_gzip_encoding ) {
 			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Gzipping buffer.", 5 );
-			$gzdata = gzencode( $buffer . "<!-- Compression = gzip -->", 3, FORCE_GZIP );
+			wp_cache_add_to_buffer( $buffer, "Compression = gzip" );
-			$gzsize = strlen($gzdata);
+			$gzdata = gzencode( $buffer, 6, FORCE_GZIP );
+			$gzsize = function_exists( 'mb_strlen' ) ? mb_strlen( $gzdata, '8bit' ) : strlen( $gzdata );
 		}
 		if ($wp_cache_gzip_encoding) {
 			$wp_cache_meta[ 'headers' ][ 'Content-Encoding' ] = 'Content-Encoding: ' . $wp_cache_gzip_encoding;
 			$wp_cache_meta[ 'headers' ][ 'Vary' ] = 'Vary: Accept-Encoding, Cookie';
 			// Return uncompressed data & store compressed for later use
-			if( $fr ) {
+			if ( false == $wp_cache_object_cache ) {
-				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing gzipped buffer to wp-cache cache file.", 5 );
+				if( $fr ) {
-				fputs($fr, $gzdata);
+					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing gzipped buffer to wp-cache cache file.", 5 );
+					fputs($fr, $gzdata);
+				}
+			} elseif ( $cache_enabled ) {
+				wp_cache_set( $oc_key . ".gz", $gzdata, 'supercache', $cache_max_time );
+				$added_cache = 1;
 			}
 		} else { // no compression
 			$wp_cache_meta[ 'headers' ][ 'Vary' ] = 'Vary: Cookie';
-			if( $fr ) {
+			if ( false == $wp_cache_object_cache ) {
-				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing non-gzipped buffer to wp-cache cache file.", 5 );
+				if( $fr ) {
-				fputs($fr, $buffer);
+					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing non-gzipped buffer to wp-cache cache file.", 5 );
+					fputs($fr, $buffer);
+				}
+			} elseif ( $cache_enabled ) {
+				wp_cache_set( $oc_key, $buffer, 'supercache', $cache_max_time );
+				$added_cache = 1;
+			}
+		}
+		if ( false == $wp_cache_object_cache ) {
+			if( $fr2 ) {
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing non-gzipped buffer to supercache file.", 5 );
+				wp_cache_add_to_buffer( $buffer, "super cache" );
+				fputs($fr2, $buffer );
+			}
+			if( $gz ) {
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing gzipped buffer to supercache file.", 5 );
+				fwrite($gz, $gzdata );
+			}
+		}
+	}
+	$new_cache = true;
+	if ( false == $wp_cache_object_cache ) {
+		if( $fr ) {
+			$supercacheonly = false;
+			fclose($fr);
+			if ( filesize( $tmp_wpcache_filename ) == 0 ) {
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Warning! The file $tmp_wpcache_filename was empty. Did not rename to {$blog_cache_dir}{$cache_filename}", 5 );
+				@unlink( $tmp_wpcache_filename );
+			} else {
+				if ( !rename( $tmp_wpcache_filename, $blog_cache_dir . $cache_filename ) ) {
+					if ( false == is_dir( $blog_cache_dir ) )
+						@wp_mkdir_p( $blog_cache_dir );
+					unlink( $blog_cache_dir . $cache_filename );
+					rename( $tmp_wpcache_filename, $blog_cache_dir . $cache_filename );
+				}
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Renamed temp wp-cache file to {$blog_cache_dir}$cache_filename", 5 );
+				$added_cache = 1;
 			}
 		}
 		if( $fr2 ) {
-			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing non-gzipped buffer to supercache file.", 5 );
+			fclose($fr2);
-			fputs($fr2, $buffer . '<!-- super cache -->' );
+			if ( $wp_cache_front_page_checks && $cache_fname == $supercachedir . $home_url[ 'path' ] . supercache_filename() && !( $wp_cache_is_home ) ) {
+				wp_cache_writers_exit();
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Warning! Not writing another page to front page cache.", 1 );
+				return $buffer;
+			} elseif ( filesize( $tmp_cache_filename ) == 0 ) {
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Warning! The file $tmp_cache_filename was empty. Did not rename to {$cache_fname}", 5 );
+				@unlink( $tmp_cache_filename );
+			} else {
+				if ( !@rename( $tmp_cache_filename, $cache_fname ) ) {
+					@unlink( $cache_fname );
+					@rename( $tmp_cache_filename, $cache_fname );
+				}
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Renamed temp supercache file to $cache_fname", 5 );
+				$added_cache = 1;
+			}
+		}
+		if ( isset( $php_fd ) ) {
+			fclose( $php_fd );
+			if ( $php_fname == $supercachedir . $home_url[ 'path' ] . supercache_filename() . '.php' && !( $wp_cache_is_home ) ) {
+				wp_cache_writers_exit();
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Warning! Not writing another page to front page cache.", 1 );
+				return $buffer;
+			} elseif ( filesize( $tmp_php_filename ) == 0 ) {
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Warning! The file $tmp_php_filename was empty. Did not rename to {$php_fname}", 5 );
+				@unlink( $tmp_php_filename );
+			} else {
+				if ( !@rename( $tmp_php_filename, $php_fname ) ) {
+					@unlink( $php_fname );
+					@rename( $tmp_php_filename, $php_fname );
+				}
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Renamed temp supercache file to $php_fname", 5 );
+				$added_cache = 1;
+			}
 		}
 		if( $gz ) {
-			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing gzipped buffer to supercache file.", 5 );
+			fclose($gz);
-			fwrite($gz, $gzdata );
+			if ( filesize( $tmp_cache_filename . '.gz' ) == 0 ) {
-		}
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Warning! The file {$tmp_cache_filename}.gz was empty. Did not rename to {$cache_fname}.gz", 5 );
-		$buffer .= $log;
+				@unlink( $tmp_cache_filename . '.gz' );
-	}
+			} else {
-	$new_cache = true;
+				if ( !@rename( $tmp_cache_filename . '.gz', $cache_fname . '.gz' ) ) {
-	$added_cache = 0;
+					@unlink( $cache_fname . '.gz' );
-	if( $fr ) {
+					@rename( $tmp_cache_filename . '.gz', $cache_fname . '.gz' );
-		$supercacheonly = false;
+				}
-		fclose($fr);
+				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Renamed temp supercache gz file to {$cache_fname}.gz", 5 );
-		if( !rename( $tmp_wpcache_filename, $blog_cache_dir . $cache_filename ) ) {
+				$added_cache = 1;
-			unlink( $blog_cache_dir . $cache_filename );
+			}
-			rename( $tmp_wpcache_filename, $blog_cache_dir . $cache_filename );
+		}
-		}
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Renamed temp wp-cache file to {$blog_cache_dir}$cache_filename", 5 );
-		$added_cache = 1;
-	}
-	if( $fr2 ) {
-		fclose($fr2);
-		if( !@rename( $tmp_cache_filename, $cache_fname ) ) {
-			@unlink( $cache_fname );
-			@rename( $tmp_cache_filename, $cache_fname );
-		}
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Renamed temp supercache file to $cache_fname", 5 );
-		$added_cache = 1;
-	}
-	if( $gz ) {
-		fclose($gz);
-		if( !@rename( $tmp_cache_filename . '.gz', $cache_fname . '.gz' ) ) {
-			@unlink( $cache_fname . '.gz' );
-			@rename( $tmp_cache_filename . '.gz', $cache_fname . '.gz' );
-		}
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Renamed temp supercache gz file to {$cache_fname}.gz", 5 );
-		$added_cache = 1;
 	}
 	if ( $added_cache && isset( $wp_supercache_cache_list ) && $wp_supercache_cache_list ) {
 		update_option( 'wpsupercache_count', ( get_option( 'wpsupercache_count' ) + 1 ) );
 		$last_urls = (array)get_option( 'supercache_last_cached' );
 		if ( count( $last_urls ) >= 10 )
 			$last_urls = array_slice( $last_urls, 1, 9 );
 		$last_urls[] = array( 'url' => $_SERVER[ 'REQUEST_URI' ], 'date' => date( 'Y-m-d H:i:s' ) );
 		update_option( 'supercache_last_cached', $last_urls );
 	}
 	wp_cache_writers_exit();
-	if ( !headers_sent() && isset( $wp_cache_gzip_first ) && 1 == $wp_cache_gzip_first && $wp_cache_gzip_encoding && $gzdata) {
+	if ( !headers_sent() && $wp_cache_gzip_encoding && $gzdata) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing gzip content headers. Sending buffer to browser", 5 );
 		header( 'Content-Encoding: ' . $wp_cache_gzip_encoding );
 		header( 'Vary: Accept-Encoding, Cookie' );
 		header( 'Content-Length: ' . $gzsize );
 		return $gzdata;
 	if( !wp_cache_writers_entry() )
 		return false;
 	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Cleaning cache in $blog_cache_dir", 3 );
 	if ( ( $handle = @opendir( $blog_cache_dir ) ) ) {
 		while ( false !== ($file = @readdir($handle))) {
-			if ( preg_match("/^$file_prefix/", $file) )
+			if ( preg_match("/^$file_prefix/", $file) ) {
-				@unlink( $blog_cache_dir . $file );
+				$meta = unserialize( file_get_contents( $blog_cache_dir . 'meta/' . $file ) );
+				if ( $meta[ 'blog_id' ] == $wpdb->blogid ) {
+					@unlink( $blog_cache_dir . $file );
+					@unlink( $blog_cache_dir . 'meta/' . str_replace( '.html', '.meta', $file ) );
+				}
+			}
 		}
 		closedir($handle);
 	}
 	wp_cache_writers_exit();
 }
 function prune_super_cache( $directory, $force = false, $rename = false ) {
-	global $cache_max_time, $cache_path, $super_cache_enabled, $cache_rebuild_files, $blog_cache_dir;
+	global $cache_max_time, $cache_path, $cache_rebuild_files, $blog_cache_dir;
+	static $log = 0;
-	if( !is_admin() && $super_cache_enabled == 0 )
-		return false;
 	if( !isset( $cache_max_time ) )
 		$cache_max_time = 3600;
 	$now = time();
 						$donotdelete = false;
 						while( !$donotdelete && ( $file = @readdir( $handle ) ) !== false ) {
 							if ($file == '.' || $file == '..')
 								continue;
 							$donotdelete = true;
+							if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "gc: could not delete $entry as it's not empty: $file", 2 );
 						}
 						closedir($handle);
 					}
 					if( $donotdelete )
 						continue;
 					if( !$rename ) {
 						@rmdir( $entry );
-						if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "gc: deleted $entry", 2 );
+						$log++;
+						if ( $force ) {
+							if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "gc: deleted $entry, forced delete", 2 );
+						} else {
+							if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "gc: deleted $entry, older than $cache_max_time seconds", 2 );
+						}
 					}
 				}
 			}
 			closedir($dh);
 		}
 	} elseif( is_file($directory) && ($force || @filemtime( $directory ) + $cache_max_time <= $now ) ) {
 		$oktodelete = true;
 		if( in_array( $directory, $protected_directories ) )
 			$oktodelete = false;
 		if( $oktodelete && !$rename ) {
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "prune_super_cache: deleted $directory", 5 );
 			@unlink( $directory );
+			$log++;
 		} elseif( $oktodelete && $rename ) {
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "prune_super_cache: wp_cache_rebuild_or_delete( $directory )", 5 );
 			wp_cache_rebuild_or_delete( $directory );
-		}
+			$log++;
-	}
+		}
+	}
+	return $log;
 }
 function wp_cache_rebuild_or_delete( $file ) {
 	global $cache_rebuild_files;
 	if( strpos( $file, '?' ) !== false )
 		@unlink( $file );
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "rebuild_or_gc: deleted $file", 2 );
 	}
 }
-function wp_cache_phase2_clean_expired($file_prefix) {
+function wp_cache_phase2_clean_expired( $file_prefix, $force = false ) {
-	global $cache_path, $cache_max_time, $blog_cache_dir;
+	global $cache_path, $cache_max_time, $blog_cache_dir, $wp_cache_preload_on;
 	clearstatcache();
 	if( !wp_cache_writers_entry() )
 		return false;
 	$now = time();
 			}
 			if($file != '.' && $file != '..') {
 				if( is_dir( $blog_cache_dir . $file ) == false && (@filemtime($blog_cache_dir . $file) + $cache_max_time) <= $now  ) {
 					if( substr( $file, -9 ) != '.htaccess' ) {
 						@unlink($blog_cache_dir . $file);
-						if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Deleting $blog_cache_dir{$file}", 5 );
+						if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Deleting $blog_cache_dir{$file}, older than $cache_max_time seconds", 5 );
 					}
 				}
 			}
 		}
 		closedir($handle);
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Doing GC on supercache dir: {$cache_path}supercache", 2 );
+		if ( false == $wp_cache_preload_on || true == $force ) {
-		prune_super_cache( $cache_path . 'supercache' );
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Doing GC on supercache dir: {$cache_path}supercache", 2 );
+			$deleted = prune_super_cache( $cache_path . 'supercache', false, false );
+		}
 	}
 	wp_cache_writers_exit();
-	return true;
+	return $deleted;
 }
 function wp_cache_shutdown_callback() {
 	global $cache_path, $cache_max_time, $file_expired, $file_prefix, $meta_file, $new_cache, $wp_cache_meta, $known_headers, $blog_id, $wp_cache_gzip_encoding, $gzsize, $cache_filename, $supercacheonly, $blog_cache_dir;
-	global $wp_cache_blog_charset, $wp_cache_request_uri, $wp_cache_key;
+	global $wp_cache_request_uri, $wp_cache_key, $wp_cache_object_cache, $cache_enabled, $wp_cache_blog_charset, $wp_cache_not_logged_in;
+	global $WPSC_HTTP_HOST;
-	$wp_cache_meta[ 'uri' ] = $_SERVER["SERVER_NAME"].preg_replace('/[ <>\'\"\r\n\t\(\)]/', '', $wp_cache_request_uri); // To avoid XSS attacks
+	$wp_cache_meta[ 'uri' ] = $WPSC_HTTP_HOST . preg_replace('/[ <>\'\"\r\n\t\(\)]/', '', $wp_cache_request_uri); // To avoid XSS attacks
 	$wp_cache_meta[ 'blog_id' ] = $blog_id;
 	$wp_cache_meta[ 'post' ] = wp_cache_post_id();
 	$wp_cache_meta[ 'key' ] = $wp_cache_key;
 	$wp_cache_meta = apply_filters( 'wp_cache_meta', $wp_cache_meta );
 	foreach ($known_headers as $key) {
 		if(isset($response[$key])) {
 			$wp_cache_meta[ 'headers' ][ $key ] = "$key: " . $response[$key];
 		}
 	}
+	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_shutdown_callback: collecting meta data.", 2 );
 	if (!isset( $response['Last-Modified'] )) {
 		$value = gmdate('D, d M Y H:i:s') . ' GMT';
 		/* Dont send this the first time */
 		/* @header('Last-Modified: ' . $value); */
 		$wp_cache_meta[ 'headers' ][ 'Last-Modified' ] = "Last-Modified: $value";
 	}
-	if (!$response['Content-Type'] && !$response['Content-type']) {
+	if ( !isset( $response[ 'Content-Type' ] ) && !isset( $response[ 'Content-type' ] ) ) {
 		// On some systems, headers set by PHP can't be fetched from
 		// the output buffer. This is a last ditch effort to set the
 		// correct Content-Type header for feeds, if we didn't see
 		// it in the response headers already. -- dougal
 		if (is_feed()) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Sending 'Content-Type: $value' header.", 2 );
 		@header("Content-Type: $value");
 		$wp_cache_meta[ 'headers' ][ 'Content-Type' ] = "Content-Type: $value";
 	}
-	if ( ! $supercacheonly && $new_cache ) {
+	if ( $cache_enabled && !$supercacheonly && $new_cache ) {
-		if( $wp_cache_gzip_encoding && !in_array( 'Content-Encoding: ' . $wp_cache_gzip_encoding, $wp_cache_meta[ 'headers' ] ) ) {
+		if( !isset( $wp_cache_meta[ 'dynamic' ] ) && $wp_cache_gzip_encoding && !in_array( 'Content-Encoding: ' . $wp_cache_gzip_encoding, $wp_cache_meta[ 'headers' ] ) ) {
 			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Sending gzip headers.", 2 );
 			$wp_cache_meta[ 'headers' ][ 'Content-Encoding' ] = 'Content-Encoding: ' . $wp_cache_gzip_encoding;
 			$wp_cache_meta[ 'headers' ][ 'Vary' ] = 'Vary: Accept-Encoding, Cookie';
 		}
 		$serial = serialize($wp_cache_meta);
 		if( wp_cache_writers_entry() ) {
 			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Writing meta file: {$blog_cache_dir}meta/{$meta_file}", 2 );
-			$tmp_meta_filename = $blog_cache_dir . 'meta/' . uniqid( mt_rand(), true ) . '.tmp';
+			if ( false == $wp_cache_object_cache ) {
-			$fr = @fopen( $tmp_meta_filename, 'w');
+				$tmp_meta_filename = $blog_cache_dir . 'meta/' . uniqid( mt_rand(), true ) . '.tmp';
-			if( !$fr )
+				$fr = @fopen( $tmp_meta_filename, 'w');
-				@mkdir( $blog_cache_dir . 'meta' );
+				if( !$fr )
-			$fr = fopen( $tmp_meta_filename, 'w');
+					@wp_mkdir_p( $blog_cache_dir . 'meta' );
-			fputs($fr, $serial);
+				$fr = @fopen( $tmp_meta_filename, 'w');
-			fclose($fr);
+				if ( $fr ) {
-			@chmod( $tmp_meta_filename, 0666 & ~umask());
+					fputs($fr, $serial);
-			if( !@rename( $tmp_meta_filename, $blog_cache_dir . 'meta/' . $meta_file ) ) {
+					fclose($fr);
-				unlink( $blog_cache_dir . 'meta/' . $meta_file );
+					@chmod( $tmp_meta_filename, 0666 & ~umask());
-				rename( $tmp_meta_filename, $blog_cache_dir . 'meta/' . $meta_file );
+					if( !@rename( $tmp_meta_filename, $blog_cache_dir . 'meta/' . $meta_file ) ) {
+						@unlink( $blog_cache_dir . 'meta/' . $meta_file );
+						@rename( $tmp_meta_filename, $blog_cache_dir . 'meta/' . $meta_file );
+					}
+				} else {
+					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Problem writing meta file: {$blog_cache_dir}meta/{$meta_file}", 2 );
+				}
+			} elseif ( $cache_enabled ) {
+				$oc_key = get_oc_key() . ".meta";
+				if ( gzip_accepted() )
+					$oc_key .= ".gz";
+				wp_cache_set( $oc_key, $serial, 'supercache', $cache_max_time );
 			}
 			wp_cache_writers_exit();
 		}
+	} else {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Did not write meta file: $meta_file *$supercacheonly* *$wp_cache_not_logged_in* *$new_cache*", 2 );
 	}
 	global $time_to_gc_cache;
 	if( isset( $time_to_gc_cache ) && $time_to_gc_cache == 1 ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Executing wp_cache_gc action.", 3 );
 		do_action( 'wp_cache_gc' );
 	$comment = get_comment($comment_id, ARRAY_A);
 	if ( $status != 'NA' ) {
 		$comment[ 'old_comment_approved' ] = $comment[ 'comment_approved' ];
 		$comment[ 'comment_approved' ] = $status;
 	}
+	if ( ( $status == 'trash' || $status == 'spam' ) && $comment[ 'old_comment_approved' ] != 1 ) {
+		// don't modify cache if moderated comments are trashed or spammed
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Moderated comment deleted or spammed. Don't delete any cache files.", 4 );
+		define( 'DONOTDELETECACHE', 1 );
+		return wp_cache_post_id();
+	}
 	$postid = $comment['comment_post_ID'];
 	// Do nothing if comment is not moderated
 	// http://ocaoimh.ie/2006/12/05/caching-wordpress-with-wp-cache-in-a-spam-filled-world
 	if ( !preg_match('/wp-admin\//', $wp_cache_request_uri) ) {
 		if ( $comment['comment_approved'] == 'delete' && ( isset( $comment[ 'old_comment_approved' ] ) && $comment[ 'old_comment_approved' ] == 0 ) ) { // do nothing if moderated comments are deleted
 			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Moderated comment deleted. Don't delete any cache files.", 4 );
+			define( 'DONOTDELETECACHE', 1 );
 			return $postid;
 		} elseif ( $comment['comment_approved'] == 'spam' ) {
 			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Spam comment. Don't delete any cache files.", 4 );
+			define( 'DONOTDELETECACHE', 1 );
 			return $postid;
 		} elseif( $comment['comment_approved'] == '0' ) {
 			if ( $comment[ 'content_type' ] == '' ) {
 				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Moderated comment. Don't delete supercache file until comment approved.", 4 );
 				$super_cache_enabled = 0; // don't remove the super cache static file until comment is approved
+				define( 'DONOTDELETECACHE', 1 );
 			} else {
 				if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Moderated ping or trackback. Not deleting cache files..", 4 );
+				define( 'DONOTDELETECACHE', 1 );
 				return $postid;
 			}
 		}
 	}
 	// We must check it up again due to WP bugs calling two different actions
 	// for delete, for example both wp_set_comment_status and delete_comment
 	// are called when deleting a comment
 	if ($postid > 0)  {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Post $postid changed. Update cache.", 4 );
-		return wp_cache_post_change($postid);
+		return wp_cache_post_change( $postid );
+	} elseif ( $_GET[ 'delete_all' ] != 'Empty Trash' && $_GET[ 'delete_all2' ] != 'Empty Spam' ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Unknown post changed. Update cache.", 4 );
+		return wp_cache_post_change( wp_cache_post_id() );
+	}
+}
+/* Used by wp_update_nav_menu action to clear current blog's cache files when navigation menu is modified */
+function wp_cache_clear_cache_on_menu() {
+	global $wpdb;
+	wp_cache_clear_cache( $wpdb->blogid );
+}
+/* Clear out the cache directory. */
+function wp_cache_clear_cache( $blog_id = 0 ) {
+	global $cache_path, $wp_cache_object_cache;
+	if ( $wp_cache_object_cache ) {
+		reset_oc_version();
 	} else {
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Unknown post changed. Update cache.", 4 );
+		if ( $blog_id == 0 ) {
-		return wp_cache_post_change(wp_cache_post_id());
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Clearing all cached files in wp_cache_clear_cache()", 4 );
-	}
+			prune_super_cache( $cache_path . 'supercache/', true );
-}
+			prune_super_cache( $cache_path, true );
+		} else {
-/* Clear out the cache directory. */
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Clearing all cached files for blog $blog_id in wp_cache_clear_cache()", 4 );
-function wp_cache_clear_cache() {
+			prune_super_cache( get_supercache_dir( $blog_id ), true );
-	global $cache_path;
+			prune_super_cache( $cache_path . 'blogs/', true );
-	prune_super_cache( $cache_path . 'supercache/', true );
+		}
-	prune_super_cache( $cache_path, true );
+	}
 }
+/* check if we want to clear out all cached files on post updates, otherwise call standard wp_cache_post_change() */
 function wp_cache_post_edit($post_id) {
 	global $wp_cache_clear_on_post_edit, $cache_path, $blog_cache_dir;
+	static $last_post_edited = -1;
+	if ( $post_id == $last_post_edited ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_edit: Already processed post $post_id.", 4 );
+		return $post_id;
+	}
+	$post = get_post( $post_id );
+	// Some users are inexplicibly seeing this error on scheduled posts.
+	// define this constant to disable the post status check.
+	if ( false == defined( 'WPSCFORCEUPDATE' ) && $post->post_status != 'publish' ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_edit: draft post, not deleting any cache files.", 4 );
+		return $post_id;
+	}
+	// we want to process the post again just in case it becomes published before the second time this function is called.
+	$last_post_edited = $post_id;
 	if( $wp_cache_clear_on_post_edit ) {
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Clearing cache $blog_cache_dir and {$cache_path}supercache/ on post edit per config.", 2 );
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_edit: Clearing cache $blog_cache_dir and {$cache_path}supercache/ on post edit per config.", 2 );
-		prune_super_cache( $blog_cache_dir, true );
+		if ( $wp_cache_object_cache ) {
-		prune_super_cache( $cache_path . 'supercache/', true );
+			reset_oc_version();
+		} else {
+			prune_super_cache( $blog_cache_dir, true );
+			prune_super_cache( get_supercache_dir(), true );
+		}
 	} else {
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Clearing cache for post $post_id on post edit.", 2 );
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_edit: Clearing cache for post $post_id on post edit.", 2 );
 		wp_cache_post_change( $post_id );
 	}
 }
-function wp_cache_post_id_gc( $siteurl, $post_id ) {
+function wp_cache_post_id_gc( $siteurl, $post_id, $all = 'all' ) {
-	global $cache_path;
+	global $cache_path, $wp_cache_object_cache, $wp_cache_refresh_single_only;
+	if ( $wp_cache_object_cache )
+		reset_oc_version();
 	$post_id = intval( $post_id );
 	if( $post_id == 0 )
 		return;
 	$permalink = trailingslashit( str_replace( get_option( 'home' ), '', post_permalink( $post_id ) ) );
-	$dir = $cache_path . 'supercache/' . $siteurl;
+	$dir = get_current_url_supercache_dir( $post_id );
-	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_id_gc clearing cache in $dir{$permalink}.", 4 );
+	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_id_gc post_id: $post_id " . post_permalink( $post_id ) . " clearing cache in $dir.", 4 );
-	prune_super_cache( $dir . $permalink, true, true );
+	if ( $all == 'all' ) {
-	@rmdir( $dir . $permalink );
+		prune_super_cache( $dir, true, true );
-	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_id_gc clearing cache in {$dir}page/.", 4 );
+		do_action( 'gc_cache', 'prune', $permalink );
-	prune_super_cache( $dir . 'page/', true );
+		@rmdir( $dir );
-}
+	} else {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_id_gc clearing cached index files in $dir.", 4 );
-function wp_cache_post_change($post_id) {
+		prune_super_cache( $dir, true, true );
-	global $file_prefix, $cache_path, $blog_id, $super_cache_enabled, $blog_cache_dir, $blogcacheid;
+		do_action( 'gc_cache', 'prune', $permalink );
+	}
+	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_id_gc clearing cache in {$dir}/page/.", 4 );
+	prune_super_cache( $dir . '/page/', true );
+	$supercache_home = get_supercache_dir();
+	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_id_gc clearing cache in {$supercache_home}/page/.", 4 );
+	prune_super_cache( $supercache_home . '/page/', true );
+	do_action( 'gc_cache', 'prune', '/page/' );
+}
+function wp_cache_post_change( $post_id ) {
+	global $file_prefix, $cache_path, $blog_id, $super_cache_enabled, $blog_cache_dir, $blogcacheid, $wp_cache_refresh_single_only;
 	static $last_processed = -1;
-	if ($post_id == $last_processed) return $post_id;
+	if ( $post_id == $last_processed ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_change: Already processed post $post_id.", 4 );
+		return $post_id;
+	}
+	$post = get_post( $post_id );
+	// Some users are inexplicibly seeing this error on scheduled posts.
+	// define this constant to disable the post status check.
+	if ( false == defined( 'WPSCFORCEUPDATE' ) && $post->post_status != 'publish' ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_change: draft post, not deleting any cache files.", 4 );
+		return $post_id;
+	}
 	$last_processed = $post_id;
 	if( !wp_cache_writers_entry() )
 		return $post_id;
+	if ( isset( $wp_cache_refresh_single_only ) && $wp_cache_refresh_single_only && ( strpos( $_SERVER[ 'HTTP_REFERER' ], 'edit-comments.php' ) || strpos( $_SERVER[ 'REQUEST_URI' ], 'wp-comments-post.php' ) ) ) {
+		if ( defined( 'DONOTDELETECACHE' ) ) {
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_change: comment detected and it's moderated or spam. Not deleting cached files.", 4 );
+			return $post_id;
+		} else {
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_post_change: comment detected. only deleting post page.", 4 );
+			$all = false;
+		}
+	} else {
+		$all = true;
+	}
+	if ( $wp_cache_object_cache )
+		reset_oc_version();
 	$permalink = trailingslashit( str_replace( get_option( 'siteurl' ), '', post_permalink( $post_id ) ) );
 	if( $super_cache_enabled ) {
+		$dir = get_supercache_dir();
 		$siteurl = trailingslashit( strtolower( preg_replace( '/:.*$/', '', str_replace( 'http://', '', get_option( 'home' ) ) ) ) );
 		// make sure the front page has a rebuild file
-		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Post change: deleting cache files in " . $cache_path . 'supercache/' . $siteurl, 4 );
-		prune_super_cache( $cache_path . 'supercache/' . $siteurl . 'index.html', true, true );
-		prune_super_cache( $cache_path . 'supercache/' . $siteurl . 'index.html.gz', true, true );
 		wp_cache_post_id_gc( $siteurl, $post_id );
-		if( get_option( 'show_on_front' ) == 'page' ) {
+		if ( $all == true ) {
-			wp_cache_post_id_gc( $siteurl, get_option( 'page_on_front' ) );
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Post change: deleting cache files in " . $cache_path . 'supercache/' . $siteurl, 4 );
-			wp_cache_post_id_gc( $siteurl, get_option( 'page_for_posts' ) );
+			$files_to_check = get_all_supercache_filenames( $dir );
+			foreach( $files_to_check as $cache_file ) {
+				prune_super_cache( $dir . $cache_file, true, true );
+			}
+			do_action( 'gc_cache', 'prune', 'homepage' );
+		}
+		if( $all == true && get_option( 'show_on_front' ) == 'page' ) {
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Post change: deleting page_on_front and page_for_posts pages.", 4 );
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Post change: page_on_front " . get_option( 'page_on_front' ), 4 );
+			wp_cache_post_id_gc( $siteurl, get_option( 'page_on_front' ), 'single' );
+			$permalink = trailingslashit( str_replace( get_option( 'home' ), '', post_permalink( get_option( 'page_for_posts' ) ) ) );
+			$files_to_check = get_all_supercache_filenames( $dir . $permalink );
+			foreach( $files_to_check as $cache_file ) {
+				prune_super_cache( $dir . $permalink . $cache_file, true, true );
+			}
+			do_action( 'gc_cache', 'prune', $permalink );
 		}
 	}
 	$matches = array();
 	if ( ($handle = @opendir( $blog_cache_dir . 'meta/' )) ) {
 			if ( preg_match("/^({$file_prefix}{$blogcacheid}.*)\.meta/", $file, $matches) ) {
 				$meta_pathname = $blog_cache_dir . 'meta/' . $file;
 				$content_pathname = $blog_cache_dir . $matches[1] . ".html";
 				$meta = unserialize(@file_get_contents($meta_pathname));
 				if( false == is_array( $meta ) ) {
+					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Post change cleaning up stray file: $content_pathname", 4 );
 					@unlink($meta_pathname);
 					@unlink($content_pathname);
 					continue;
 				}
 				if ($post_id > 0 && $meta) {
-					if ($meta[ 'blog_id' ] == $blog_id  && (!$meta[ 'post' ] || $meta[ 'post' ] == $post_id) ) {
+					$permalink = trailingslashit( str_replace( get_option( 'home' ), '', post_permalink( $post_id ) ) );
+					if ( $meta[ 'blog_id' ] == $blog_id  && ( ( $all == true && !$meta[ 'post' ] ) || $meta[ 'post' ] == $post_id) ) {
+						if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Post change: deleting post cache files for {$meta[ 'uri' ]}: $content_pathname", 4 );
 						@unlink($meta_pathname);
 						@unlink($content_pathname);
-						@wp_cache_rebuild_or_delete($cache_path . 'supercache/' . trailingslashit( $meta[ 'uri' ] ) . 'index.html');
+						if ( $super_cache_enabled == true ) {
-						@wp_cache_rebuild_or_delete($cache_path . 'supercache/' . trailingslashit( $meta[ 'uri' ] ) . 'index.html.gz');
+							@prune_super_cache( $dir . $permalink, true, true );
+							do_action( 'gc_cache', 'rebuild', $permalink );
+						}
 					}
 				} elseif ($meta[ 'blog_id' ] == $blog_id) {
+					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Post change: deleting cache files for {$meta[ 'uri' ]}: $content_pathname", 4 );
 					@unlink($meta_pathname);
 					@unlink($content_pathname);
-					@wp_cache_rebuild_or_delete($cache_path . 'supercache/' . trailingslashit( $meta[ 'uri' ] ) . 'index.html');
+					if ( $super_cache_enabled == true ) {
-					@wp_cache_rebuild_or_delete($cache_path . 'supercache/' . trailingslashit( $meta[ 'uri' ] ) . 'index.html.gz');
+						$files_to_check = get_all_supercache_filenames( $dir . $meta[ 'uri' ] );
+						foreach( $files_to_check as $cache_file ) {
+							@wp_cache_rebuild_or_delete( $dir . trailingslashit( $meta[ 'uri' ] ) . $cache_file );
+						}
+						do_action( 'gc_cache', 'rebuild', trailingslashit( $meta[ 'uri' ] ) );
+					}
 				}
 			}
 		}
 		closedir($handle);
 	if (isset( $_GET[ 'p' ] ) && $_GET['p'] > 0) return $_GET['p'];
 	if (isset( $_POST[ 'p' ] ) && $_POST['p'] > 0) return $_POST['p'];
 	return 0;
 }
+function maybe_stop_gc( $flag ) {
+	if ( @file_exists( $flag ) ) {
+		if ( time() - filemtime( $flag ) > 3600 ) {
+			@unlink( $flag );
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "maybe_stop_gc: GC flag found but deleted because it's older than 3600 seconds.", 5 );
+			return false;
+		} else {
+			if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'maybe_stop_gc: GC flag found. GC cancelled.', 5 );
+			return true;
+		}
+	} else {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'maybe_stop_gc: GC flag not found. GC will go ahead..', 5 );
+		return false;
+	}
+}
+function get_gc_flag() {
+	global $cache_path;
+	return $cache_path . strtolower( preg_replace( '!/:.*$!', '', str_replace( 'http://', '', str_replace( 'https://', '', get_option( 'home' ) ) ) ) ) . "_wp_cache_gc.txt";
+}
 function wp_cache_gc_cron() {
-	global $file_prefix, $cache_max_time;
+	global $file_prefix, $cache_max_time, $cache_gc_email_me, $cache_time_interval;
+	$msg = '';
+	if ( $cache_max_time == 0 ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Cache garbage collection disabled because cache expiry time is zero.', 5 );
+		return false;
+	}
+	$gc_flag = get_gc_flag();
+	if ( maybe_stop_gc( $gc_flag ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'GC flag found. GC cancelled.', 5 );
+		return false;
+	}
+	update_option( 'wpsupercache_gc_time', time() );
+	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "wp_cache_gc_cron: Set GC Flag. ($gc_flag)", 5 );
+	$fp = @fopen( $gc_flag, 'w' );
+	@fclose( $fp );
 	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Cache garbage collection.', 5 );
 	if( !isset( $cache_max_time ) )
 		$cache_max_time = 600;
 	$start = time();
-	if( !wp_cache_phase2_clean_expired($file_prefix ) ) {
+	$num = 0;
+	if( false === ( $num = wp_cache_phase2_clean_expired( $file_prefix ) ) ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'Cache Expiry cron job failed. Probably mutex locked.', 1 );
-		update_option( 'wpsupercache_gc_time', time() - ( $cache_max_time - 10 ) ); // if GC failed then run it again in one minute
+		update_option( 'wpsupercache_gc_time', time() - ( $cache_time_interval - 10 ) ); // if GC failed then run it again in one minute
-	}
+		$msg .= __( 'Cache expiry cron job failed. Job will run again in 10 seconds.', 'wp-super-cache' ) . "\n";
-	if( time() - $start > 30 )
+	}
+	if( time() - $start > 30 ) {
 		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( "Cache Expiry cron job took more than 30 seconds to execute.\nYou should reduce the Expiry Time in the WP Super Cache admin page\nas you probably have more cache files than your server can handle efficiently.", 1 );
+		$msg .= __( 'Cache expiry cron job took more than 30 seconds. You should probably run the garbage collector more often.', 'wp-super-cache' ) . "\n";
+	}
+	if ( $cache_gc_email_me ) {
+		if ( $msg != '' )
+			$msg = "The following warnings were generated by the WP Super Cache Garbage Collector:\n" . $msg;
+		$msg = "Hi,\n\nThe WP Super Cache Garbage Collector has now run, deleting " . (int)$num . " files and directories.\nIf you want to switch off these emails please see the WP Super Cache Advanced Settings\npage on your blog.\n\n{$msg}\nRegards,\nThe Garbage Collector.";
+		wp_mail( get_option( 'admin_email' ), sprintf( __( '[%1$s] WP Super Cache GC Report', 'wp-super-cache' ), site_url() ), $msg );
+	}
+	@unlink( $gc_flag );
+	if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'GC completed. GC flag deleted.', 5 );
+	schedule_wp_gc( 1 );
+}
+function schedule_wp_gc( $forced = 0 ) {
+	global $cache_schedule_type, $cache_max_time, $cache_time_interval, $cache_scheduled_time, $cache_schedule_interval;
+	if ( false == isset( $cache_time_interval ) )
+		$cache_time_interval = 3600;
+	if ( false == isset( $cache_schedule_type ) ) {
+		$cache_schedule_type = 'interval';
+		$cache_schedule_interval = $cache_max_time;
+	}
+	if ( $cache_schedule_type == 'interval' ) {
+		if ( !isset( $cache_max_time ) )
+			$cache_max_time = 600;
+		if ( $cache_max_time == 0 )
+			return false;
+		$last_gc = get_option( "wpsupercache_gc_time" );
+		if ( !$last_gc ) {
+			update_option( 'wpsupercache_gc_time', time() );
+			$last_gc = get_option( "wpsupercache_gc_time" );
+		}
+		if ( $forced || ( $last_gc < ( time() - 60 ) ) ) { // Allow up to 60 seconds for the previous job to run
+			global $wp_cache_shutdown_gc;
+			if ( !isset( $wp_cache_shutdown_gc ) || $wp_cache_shutdown_gc == 0 ) {
+				if ( !($t = wp_next_scheduled( 'wp_cache_gc' ) ) ) {
+					wp_clear_scheduled_hook( 'wp_cache_gc' );
+					wp_schedule_single_event( time() + $cache_time_interval, 'wp_cache_gc' );
+					if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'scheduled wp_cache_gc for 10 seconds time.', 5 );
+				}
+			} else {
+				global $time_to_gc_cache;
+				$time_to_gc_cache = 1; // tell the "shutdown gc" to run!
+			}
+		}
+	} elseif ( $cache_schedule_type == 'time' && !wp_next_scheduled( 'wp_cache_gc' ) ) {
+		wp_schedule_event( strtotime( $cache_scheduled_time ), $cache_schedule_interval, 'wp_cache_gc' );
+	}
+	return true;
+}
+function wp_cache_gc_watcher() {
+	if ( false == wp_next_scheduled( 'wp_cache_gc' ) ) {
+		if ( isset( $GLOBALS[ 'wp_super_cache_debug' ] ) && $GLOBALS[ 'wp_super_cache_debug' ] ) wp_cache_debug( 'GC Watcher: scheduled new gc cron.', 5 );
+		schedule_wp_gc();
+	}
 }
 ?>

changeset 194	32102edaa81b
parent 136	bde1974c263b