Commit 6cda9635 authored by Erick Hitter's avatar Erick Hitter

Improve cache key generation

* Cache protocol-specific pages
* Ignore all query args and hashes, not just that used to clear a page's cache
parent 58792848
...@@ -34,7 +34,7 @@ function wp_redis_cache_exception_handler( $exception ) { ...@@ -34,7 +34,7 @@ function wp_redis_cache_exception_handler( $exception ) {
* *
* DO NOT EDIT BELOW THIS LINE! * DO NOT EDIT BELOW THIS LINE!
*/ */
$wp_redis_cache_config['current_url'] = wp_redis_cache_get_clean_url( $wp_redis_cache_config['secret_string'] ); $wp_redis_cache_config['current_url'] = wp_redis_cache_get_clean_url();
$wp_redis_cache_config['redis_key'] = md5( $wp_redis_cache_config['current_url'] ); $wp_redis_cache_config['redis_key'] = md5( $wp_redis_cache_config['current_url'] );
// Start the timer so we can track the page load time // Start the timer so we can track the page load time
...@@ -118,15 +118,26 @@ function wp_redis_cache_handle_cdn_remote_addressing() { ...@@ -118,15 +118,26 @@ function wp_redis_cache_handle_cdn_remote_addressing() {
/** /**
* Prepare a URL for use as a cache key * Prepare a URL for use as a cache key
* *
* Strips secret key from URL * If the URL is too malformed to parse, a one-time cache is set using microtime().
* *
* @param string
* @return string * @return string
*/ */
function wp_redis_cache_get_clean_url( $secret ) { function wp_redis_cache_get_clean_url() {
$replace_keys = array( "?refresh=${secret}","&refresh=${secret}" ); $proto = 'http';
$url = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; if ( isset( $_SERVER['HTTPS'] ) && ( 'on' === strtolower( $_SERVER['HTTPS'] ) || '1' === $_SERVER['HTTPS'] ) ) {
return str_replace( $replace_keys, '', $url ); $proto .= 's';
} elseif ( isset( $_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
$proto .= 's';
}
$url = parse_url( $proto . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
if ( $url ) {
$url = $url['scheme'] . '://' . $url['host'] . $url['path'];
} else {
$url = microtime();
}
return $url;
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment