8000 Improve shutdown callback by stodorovic · Pull Request #367 · Automattic/wp-super-cache · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Improve shutdown callback #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 28, 2017
Merged

Improve shutdown callback #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dee7f6f
Improve shutdown callback
stodorovic Aug 25, 2017
fb35591
Minor corrections, check is buffer empty
stodorovic Aug 27, 2017
1deafac
Update wp-cache-phase2.php
stodorovic Aug 27, 2017
d1051f0
Add is_404 into wp_super_cache_query_vars
stodorovic Aug 28, 2017
ceb4379
Added wpsc_only_cache_known_pages filter
donnchawp Aug 28, 2017
abdfc77
Add method_exists as additional protection
stodorovic Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wp-cache-phase1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
}
}

$wp_start_time = microtime();

if ( $wp_cache_not_logged_in && wp_cache_get_cookies_values() ) {
wp_cache_debug( 'Caching disabled for logged in users on settings page.' );
return true;
Expand Down Expand Up @@ -109,8 +111,6 @@ function setup_blog_cache_dir() {
@mkdir( $blog_cache_dir . 'meta' );
}

$wp_start_time = microtime();

function get_wp_cache_key( $url = false ) {
global $wp_cache_request_uri, $wp_cache_gzip_encoding, $WPSC_HTTP_HOST;
if ( ! $url ) {
Expand Down
76 changes: 45 additions & 31 deletions wp-cache-phase2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ function wp_cache_phase2() {
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('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' );
Expand All @@ -58,7 +58,7 @@ function wp_cache_phase2() {
header('Vary: Accept-Encoding, Cookie');
else
header('Vary: Cookie');
ob_start( 'wp_cache_ob_callback' );
ob_start( 'wp_cache_ob_callback' );
wp_cache_debug( 'Created output buffer', 4 );

// restore old supercache file temporarily
Expand Down Expand Up @@ -289,7 +289,7 @@ function wp_cache_mutex_init() {
return true;

if( !is_bool( $use_flock ) ) {
if(function_exists('sem_get'))
if(function_exists('sem_get'))
$use_flock = false;
else
$use_flock = true;
Expand Down Expand Up @@ -351,10 +351,7 @@ function wp_cache_writers_exit() {
}

function wp_super_cache_query_vars() {
global $wp_super_cache_query, $wp_query;
if ( empty( $wp_query ) ) {
$wp_query = new WP_Query();
}
global $wp_super_cache_query;
if ( is_search() )
$wp_super_cache_query[ 'is_search' ] = 1;
if ( is_page() )
Expand All @@ -373,12 +370,29 @@ function wp_super_cache_query_vars() {
$wp_super_cache_query[ 'is_home' ] = 1;
if ( is_author() )
$wp_super_cache_query[ 'is_author' ] = 1;
if ( is_feed() || get_query_var( 'sitemap' ) || get_query_var( 'xsl' ) || get_query_var( 'xml_sitemap' ) )
if ( is_feed() || ( method_exists( $GLOBALS['wp_query'], 'get') && ( get_query_var( 'sitemap' ) || get_query_var( 'xsl' ) || get_query_var( 'xml_sitemap' ) ) ) )
$wp_super_cache_query[ 'is_feed' ] = 1;
if ( is_404() )
$wp_super_cache_query = array( 'is_404' => 1 );

return $wp_super_cache_query;
}

function wpsc_is_fatal_error() {
global $wp_super_cache_query;

if ( null === ( $error = error_get_last() ) ) {
return false;
}

if ( $error['type'] & ( E_ERROR | E_CORE_ERROR | E_PARSE | E_COMPILE_ERROR | E_USER_ERROR ) ) {
$wp_super_cache_query[ 'is_fatal_error' ] = 1;
return true;
}

return false;
}

function wp_cache_ob_callback( $buffer ) {
global $wp_cache_pages, $wp_query, $wp_super_cache_query, $cache_acceptable_files, $wp_cache_no_cache_for_get, $wp_cache_object_cache, $wp_cache_request_uri, $do_rebuild_list, $wpsc_file_mtimes, $wpsc_save_headers, $super_cache_enabled;
$buffer = apply_filters( 'wp_cache_ob_callback_filter', $buffer );
Expand All @@ -388,13 +402,16 @@ function wp_cache_ob_callback( $buffer ) {
// All the things that can stop a page being cached
$cache_this_page = true;

if ( empty( $wp_super_cache_query ) ) {
if ( wpsc_is_fatal_error() ) {
$cache_this_page = false;
wp_cache_debug( 'wp_cache_ob_callback: PHP Fatal error occurred. Not caching incomplete page.' );
} elseif ( empty( $wp_super_cache_query ) && !empty( $buffer ) && is_object( $wp_query ) ) {
$wp_super_cache_query = wp_super_cache_query_vars();
}

if ( empty( $wp_super_cache_query ) ) {
if ( empty( $wp_super_cache_query ) && function_exists( 'apply_filter' ) && apply_filter( 'wpsc_only_cache_known_pages', 1 ) ) {
$cache_this_page = false;
wp_cache_debug( 'wp_cache_ob_callback: wp_super_cache_query is empty. Not caching unknown page type.' );
wp_cache_debug( 'wp_cache_ob_callback: wp_super_cache_query is empty. Not caching unknown page type. Return 0 to the wpsc_only_cache_known_pages filter to cache this page.' );
} elseif ( defined( 'DONOTCACHEPAGE' ) ) {
wp_cache_debug( 'DONOTCACHEPAGE defined. Caching disabled.', 2 );
$cache_this_page = false;
Expand Down Expand Up @@ -457,9 +474,6 @@ function wp_cache_ob_callback( $buffer ) {
if ( isset( $wpsc_save_headers ) && $wpsc_save_headers )
$super_cache_enabled = false; // use standard caching to record headers

if ( !isset( $wp_query ) )
wp_cache_debug( 'wp_cache_ob_callback: WARNING! $query not defined but the plugin has worked around that problem.', 4 );

if ( $cache_this_page ) {

wp_cache_debug( 'Output buffer callback', 4 );
Expand Down Expand Up @@ -533,7 +547,7 @@ function wp_cache_add_to_buffer( &$buffer, $text ) {
$buffer .= "\n<!-- $text -->";
}

/*
/*
* If dynamic caching is enabled then run buffer through wpsc_cachedata filter before returning it.
* or we'll return template tags to visitors.
*/
Expand Down Expand Up @@ -563,7 +577,7 @@ function wp_cache_get_ob(&$buffer) {
$new_cache = true;
$wp_cache_meta = array();

/* Mode paranoic, check for closing tags
/* Mode paranoic, check for closing tags
* we avoid caching incomplete files */
if ( $buffer == '' ) {
$new_cache = false;
Expand Down Expand Up @@ -774,13 +788,13 @@ function wp_cache_get_ob(&$buffer) {
wp_cache_debug( "Writing gzipped buffer to wp-cache cache file.", 5 );
fputs($fr, '<?php die(); ?>' . $gzdata);
} elseif ( $cache_enabled && $wp_cache_object_cache ) {
wp_cache_set( $oc_key . ".gz", $gzdata, 'supercache', $cache_max_time );
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 ( $cache_enabled && $wp_cache_object_cache ) {
wp_cache_set( $oc_key, $buffer, 'supercache', $cache_max_time );
wp_cache_set( $oc_key, $buffer, 'supercache', $cache_max_time );
$added_cache = 1;
} elseif ( $fr ) {
wp_cache_debug( "Writing non-gzipped buffer to wp-cache cache file." );
Expand All @@ -791,7 +805,7 @@ function wp_cache_get_ob(&$buffer) {
wp_cache_debug( "Writing non-gzipped buffer to supercache file." );
wp_cache_add_to_buffer( $buffer, "super cache" );
fputs($fr2, $buffer );
}
}
if ( isset( $gzdata ) && $gz ) {
wp_cache_debug( "Writing gzipped buffer to supercache file." );
fwrite($gz, $gzdata );
Expand Down Expand Up @@ -877,7 +891,7 @@ function wp_cache_phase2_clean_cache($file_prefix) {
if( !wp_cache_writers_entry() )
return false;
wp_cache_debug( "wp_cache_phase2_clean_cache: Cleaning cache in $blog_cache_dir" );
if ( $handle = @opendir( $blog_cache_dir ) ) {
if ( $handle = @opendir( $blog_cache_dir ) ) {
while ( false !== ($file = @readdir($handle))) {
if ( strpos( $file, $file_prefix ) !== false ) {
if ( strpos( $file, '.html' ) ) {
Expand Down Expand Up @@ -943,7 +957,7 @@ function prune_super_cache( $directory, $force = false, $rename = false ) {
continue;
$entry = $directory . $entry;
prune_super_cache( $entry, $force, $rename );
// If entry is a directory, AND it's not a protected one, AND we're either forcing the delete, OR the file is out of date,
// If entry is a directory, AND it's not a protected one, AND we're either forcing the delete, OR the file is out of date,
if( is_dir( $entry ) && !in_array( $entry, $protected_directories ) && ( $force || @filemtime( $entry ) + $cache_max_time <= $now ) ) {
// if the directory isn't empty can't delete it
if( $handle = @opendir( $entry ) ) {
Expand Down Expand Up @@ -1067,9 +1081,9 @@ function wp_cache_phase2_clean_expired( $file_prefix, $force = false ) {
$now = time();
wp_cache_debug( "Cleaning expired cache files in $blog_cache_dir", 2 );
$deleted = 0;
if ( ( $handle = @opendir( $blog_cache_dir ) ) ) {
if ( ( $handle = @opendir( $blog_cache_dir ) ) ) {
while ( false !== ($file = readdir($handle))) {
if ( preg_match("/^$file_prefix/", $file) &&
if ( preg_match("/^$file_prefix/", $file) &&
(@filemtime( $blog_cache_dir . $file) + $cache_max_time) <= $now ) {
@unlink( $blog_cache_dir . $file );
@unlink( $blog_cache_dir . 'meta/' . str_replace( '.html', '.meta', $file ) );
Expand Down Expand Up @@ -1259,7 +1273,7 @@ function wp_cache_get_postid_from_comment( $comment_id, $status = 'NA' ) {
}
}
// 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
// for delete, for example both wp_set_comment_status and delete_comment
// are called when deleting a comment
if ($postid > 0) {
wp_cache_debug( "Post $postid changed. Update cache.", 4 );
Expand Down Expand Up @@ -1346,7 +1360,7 5D40 @@ function wp_cache_post_edit($post_id) {
if ( is_object( $post ) == false )
return $post_id;

// Some users are inexplicibly seeing this error on scheduled posts.
// Some users are inexplicibly seeing this error on scheduled posts.
// define this constant to disable the post status check.
if ( false == defined( 'WPSCFORCEUPDATE' ) && !in_array($post->post_status, array( 'publish', 'private' ) ) ) {
wp_cache_debug( "wp_cache_post_edit: draft post, not deleting any cache files. status: " . $post->post_status, 4 );
Expand Down Expand Up @@ -1392,7 +1406,7 @@ function wp_cache_post_id_gc( $post_id, $all = 'all' ) {
do_action( 'gc_cache', 'prune', 'page/' );
} else {
wp_cache_debug( "wp_cache_post_id_gc clearing cached index files in $dir.", 4 );
prune_super_cache( $dir, true, true );
prune_super_cache( $dir, true, true );
do_action( 'gc_cache', 'prune', $permalink );
}
}
Expand All @@ -1406,7 +1420,7 @@ function wp_cache_post_change( $post_id ) {
return $post_id;
}
$post = get_post( $post_id );
// Some users are inexplicibly seeing this error on scheduled posts.
// Some users are inexplicibly seeing this error on scheduled posts.
// define this constant to disable the post status check.
if ( false == defined( 'WPSCFORCEUPDATE' ) && is_object( $post ) && !in_array($post->post_status, array( 'publish', 'private' ) ) ) {
wp_cache_debug( "wp_cache_post_change: draft post, not deleting any cache files.", 4 );
Expand Down Expand Up @@ -1461,7 +1475,7 @@ function wp_cache_post_change( $post_id ) {

wp_cache_debug( "wp_cache_post_change: checking {$blog_cache_dir}meta/", 4 );
$supercache_files_deleted = false;
if ( $handle = @opendir( $blog_cache_dir ) ) {
if ( $handle = @opendir( $blog_cache_dir ) ) {
while ( false !== ($file = readdir($handle))) {
if ( strpos( $file, $file_prefix ) !== false ) {
if ( strpos( $file, '.html' ) ) {
Expand Down Expand Up @@ -1521,7 +1535,7 @@ function wp_cache_post_id() {
// We try hard all options. More frequent first.
if ($post_ID > 0 ) return $post_ID;
if ($comment_post_ID > 0 ) return $comment_post_ID;
if (is_single() || is_page()) return $posts[0]->ID;
if (is_singular() && !empty($posts)) return $posts[0]->ID;
if (isset( $_GET[ 'p' ] ) && $_GET['p'] > 0) return $_GET['p'];
if (isset( $_POST[ 'p' ] ) && $_POST['p'] > 0) return $_POST['p'];
return 0;
Expand Down Expand Up @@ -1563,7 +1577,7 @@ function wp_cache_gc_cron() {
return false;
}

update_option( 'wpsupercache_gc_time', time() );
update_option( 'wpsupercache_gc_time', time() );
wp_cache_debug( "wp_cache_gc_cron: Set GC Flag. ($gc_flag)", 5 );
$fp = @fopen( $gc_flag, 'w' );
@fclose( $fp );
Expand Down
0