8000 Fixes PHP notices (#383) and improve detects of backend request by stodorovic · Pull Request #384 · Automattic/wp-super-cache · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fixes PHP notices (#383) and improve detects of backend request #384

New issue

Have a questi 8000 on 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

Closed
wants to merge 5 commits into from
Closed

Fixes PHP notices (#383) and improve detects of backend request #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54e8e27
Fixes PHP notices (#383) and improve detects of backend request
stodorovic Sep 13, 2017
40ff00e
Improve regexp in get_current_url_supercache_dir
stodorovic Sep 14, 2017
5c96e06
Resolving a merge conflict - PR #384
stodorovic Oct 25, 2017
f8f7273
Additional checking for $WPSC_HTTP_HOST
stodorovic Oct 26, 2017
03aadf1
Fix merge conflict - PR #384
stodorovic Nov 19, 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
83 changes: 62 additions & 21 deletions 10000 wp-cache-phase1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function wp_cache_serve_cache_file() {
global $wp_cache_object_cache, $cache_compression, $wp_cache_slash_check, $wp_supercache_304, $wp_cache_home_path, $wp_cache_no_cache_for_get;
global $wp_cache_disable_utf8, $wp_cache_mfunc_enabled, $wpsc_served_header;

if ( is_admin() ) {
if ( wpsc_is_backend() ) {
wp_cache_debug( 'Not serving wp-admin requests.', 5 );
return false;
}
Expand All @@ -150,15 +150,15 @@ function wp_cache_serve_cache_file() {
}

if ( $wp_cache_no_cache_for_get && false == empty( $_GET ) ) {
wp_cache_debug( "Non empty GET request. Caching disabled on settings page. " . json_encode( $_GET ), 1 );
wp_cache_debug( "Non empty GET request. Caching disabled on settings page. " . wpsc_dump_get_request(), 1 );
return false;
}

extract( wp_super_cache_init() ); // $key, $cache_filename, $meta_file, $cache_file, $meta_pathname

if ( $wp_cache_object_cache && wp_cache_get_cookies_values() == '' ) {
if ( !empty( $_GET ) ) {
wp_cache_debug( "Non empty GET request. Not serving request from object cache. " . json_encode( $_GET ), 1 );
wp_cache_debug( "Non empty GET request. Not serving request from object cache. " . wpsc_dump_get_request(), 1 );
return false;
}

Expand Down Expand Up @@ -203,7 +203,7 @@ function wp_cache_serve_cache_file() {
wp_cache_debug( "No Super Cache file found for current URL: $file" );
return false;
} elseif ( false == empty( $_GET ) ) {
wp_cache_debug( "GET array not empty. Cannot serve a supercache file. " . json_encode( $_GET ) );
wp_cache_debug( "GET array not empty. Cannot serve a supercache file. " . wpsc_dump_get_request() );
return false;
} elseif ( wp_cache_get_cookies_values() != '' ) {
wp_cache_debug( "Cookies found. Cannot serve a supercache file. " . wp_cache_get_cookies_values() );
Expand Down Expand Up @@ -580,6 +580,48 @@ function wp_cache_debug( $message, $level = 1 ) {
error_log( $log_message, 3, $log_file );
}

function wpsc_dump_get_request() {
static $string;

if ( isset( $string) ) {
return $string;
}

if ( function_exists( 'wp_json_encode' ) ) {
$string = wp_json_encode( $_GET );
} else {
$string = json_encode( $_GET );
}

return $string;
}

function wpsc_is_backend() {
static $is_backend;

if ( isset( $is_backend ) ) {
return $is_backend;
}

$is_backend = is_admin();
if ( $is_backend ) {
return $is_backend;
}

$script = isset( $_SERVER['PHP_SELF'] ) ? basename( $_SERVER['PHP_SELF'] ) : '';
if ( $script !== 'index.php' ) {
if ( in_array( $script, array( 'wp-login.php', 'xmlrpc.php', 'wp-cron.php' ) ) ) {
$is_backend = true;
} elseif ( defined( 'DOING_CRON' ) && DOING_CRON ) {
$is_backend = true;
} elseif ( PHP_SAPI == 'cli' || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
$is_backend = true;
}
}

return $is_backend;
}

function wp_cache_user_agent_is_rejected() {
global $cache_rejected_user_agent;

Expand Down Expand Up @@ -619,24 +661,21 @@ function get_current_url_supercache_dir( $post_id = 0 ) {
if ( false === strpos( $permalink, $site_url ) ) {
/*
* Sometimes site_url doesn't return the siteurl. See https://wordpress.org/support/topic/wp-super-cache-not-refreshing-post-after-comments-made
*/
*/
$DONOTREMEMBER = 1;
wp_cache_debug( "get_current_url_supercache_dir: warning! site_url ($site_url) not found in permalink ($permalink).", 1 );
if ( $WPSC_HTTP_HOST == '' || false === strpos( $permalink, $WPSC_HTTP_HOST ) ) {
wp_cache_debug( "get_current_url_supercache_dir: WARNING! SERVER_NAME ({$WPSC_HTTP_HOST}) not found in permalink ($permalink). ", 1 );
$p = parse_url( $permalink );
if ( is_array( $p ) ) {
$uri = $p[ 'path' ];
wp_cache_debug( "get_current_url_supercache_dir: WARNING! Using $uri as permalink. Used parse_url.", 1 );
} else {
wp_cache_debug( "get_current_url_supercache_dir: WARNING! Permalink ($permalink) could not be understood by parse_url. Using front page.", 1 );
$uri = '';
wp_cache_debug( "get_current_url_supercache_dir: WARNING! site_url ($site_url) not found in permalink ($permalink).", 1 );
if ( preg_match( '`^(https?:)?//([^/]+)(/.*)?$`i', $permalink, $matches ) ) {
if ( $WPSC_HTTP_HOST != $matches[2] ) {
wp_cache_debug( "get_current_url_supercache_dir: WARNING! SERVER_NAME ({$WPSC_HTTP_HOST}) not found in permalink ($permalink).", 1 );
}
wp_cache_debug( "get_current_url_supercache_dir: Removing SERVER_NAME ({$matches[2]}) from permalink ($permalink). Is the url right?", 1 );
$uri = isset( $matches[3] ) ? $matches[3] : '';
} elseif ( preg_match( '`^/([^/]+)(/.*)?$`i', $permalink, $matches ) ) {
wp_cache_debug( "get_current_url_supercache_dir: WARNING! Permalink ($permalink) looks as absolute path. Is the url right?", 1 );
$uri = $permalink;
} else {
wp_cache_debug( "get_current_url_supercache_dir: Removing SERVER_NAME ({$WPSC_HTTP_HOST}) from permalink ($permalink). Is the url right?", 1 );
$uri = str_replace( $WPSC_HTTP_HOST, '', $permalink );
$uri = str_replace( 'http://', '', $uri );
$uri = str_replace( 'https://', '', $uri );
wp_cache_debug( "get_current_url_supercache_dir: WARNING! Permalink ($permalink) could not be understood by parsing url. Using front page.", 1 );
$uri = '';
}
} else {
$uri = str_replace( $site_url, '', $permalink );
Expand All @@ -646,8 +685,10 @@ function get_current_url_supercache_dir( $post_id = 0 ) {
} else {
$uri = strtolower( $wp_cache_request_uri );
}
$uri = wpsc_deep_replace( array( '..', '\\', 'index.php', ), preg_replace( '/[ <>\'\"\r\n\t\(\)]/', '', preg_replace( "/(\?.*)?$/", '', $uri ) ) );
$dir = preg_replace( '/:.*$/', '', $WPSC_HTTP_HOST ) . $uri; // To avoid XSS attacks
$uri = wpsc_deep_replace( array( '..', '\\', 'index.php', ), preg_replace( '/[ <>\'\"\r\n\t\(\)]/', '', preg_replace( "/(\?.*)?(#.*)?$/", '', $uri ) ) );
// Get hostname from wp options for wp-cron, wp-cli and similar requests.
$hostname = empty( $WPSC_HTTP_HOST ) ? (string) parse_url( get_option( 'home' ), PHP_URL_HOST ) : $WPSC_HTTP_HOST;
$dir = preg_replace( '/:.*$/', '', $hostname ) . $uri; // To avoid XSS attacks
if ( function_exists( "apply_filters" ) ) {
$dir = apply_filters( 'supercache_dir', $dir );
} else {
Expand Down
10 changes: 5 additions & 5 deletions wp-cache-phase2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ function wp_cache_phase2() {
do_cacheaction( 'add_cacheaction' );
}

if ( is_admin() ) {
if ( wpsc_is_backend() ) {
wp_cache_debug( 'Not caching wp-admin requests.', 5 );
return false;
}

if ( !empty( $_GET ) && !defined( "DOING_CRON" ) ) {
wp_cache_debug( 'Supercache caching disabled. Only using wp-cache. Non empty GET request. ' . json_encode( $_GET ), 5 );
if ( !empty( $_GET ) ) {
wp_cache_debug( 'Supercache caching disabled. Only using wp-cache. Non empty GET request. ' . wpsc_dump_get_request(), 5 );
$super_cache_enabled = false;
}

Expand Down Expand Up @@ -460,8 +460,8 @@ function wp_cache_ob_callback( $buffer ) {
if ( defined( 'DONOTCACHEPAGE' ) ) {
wp_cache_debug( 'DONOTCACHEPAGE defined. Caching disabled.', 2 );
$cache_this_page = false;
} elseif ( $wp_cache_no_cache_for_get && !empty( $_GET ) && false == defined( 'DOING_CRON' ) ) {
wp_cache_debug( "Non empty GET request. Caching disabled on settings page. " . json_encode( $_GET ), 1 );
} elseif ( $wp_cache_no_cache_for_get && !empty( $_GET ) ) {
wp_cache_debug( "Non empty GET request. Caching disabled on settings page. " . wpsc_dump_get_request(), 1 );
$cache_this_page = false;
} elseif ( $_SERVER["REQUEST_METHOD"] == 'POST' || !empty( $_POST ) || get_option( 'gzipcompression' ) ) {
wp_cache_debug( 'Not caching POST request.', 5 );
Expand Down
4 changes: 2 additions & 2 deletions wp-cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2190,7 +2190,7 @@ function wp_cache_remove_index() {
}
if ( is_dir( $directory . "/meta" ) ) {
if ( is_file( $directory . "/meta/index.html" ) ) {
unlink( $directory . "/index.html" );
unlink( $directory . "/meta/index.html" );
}
}
}
Expand Down Expand Up @@ -2397,7 +2397,7 @@ function wp_cache_verify_config_file() {
}
$new = true;
}
if( $sem_id == 5419 && $cache_path != '' ) {
if ( $sem_id == 5419 && $cache_path != '' && $WPSC_HTTP_HOST != '' ) {
$sem_id = crc32( $WPSC_HTTP_HOST . $cache_path ) & 0x7fffffff;
wp_cache_replace_line('sem_id', '$sem_id = ' . $sem_id . ';', $wp_cache_config_file);
}
Expand Down
0