diff --git a/wp-ffpc-acache.php b/wp-ffpc-acache.php index 23c4da1..6428f8c 100644 --- a/wp-ffpc-acache.php +++ b/wp-ffpc-acache.php @@ -53,34 +53,17 @@ else return false; /* no cache for for logged in users normally, only if enabled */ -if ( $wp_ffpc_config['cache_loggedin'] == 0 || $wp_ffpc_config['nocache_cookies'] ) { - - $nocache_cookies = array(); - if( $wp_ffpc_config['nocache_cookies'] ){ - $nocache_cookies = array_map('trim',explode(",", $wp_ffpc_config['nocache_cookies'] ) ); - } - +if ( $wp_ffpc_config['cache_loggedin'] == 0 ) { foreach ($_COOKIE as $n=>$v) { // test cookie makes to cache not work!!! if ($n == 'wordpress_test_cookie') continue; // wp 2.5 and wp 2.3 have different cookie prefix, skip cache if a post password cookie is present, also - if ( $wp_ffpc_config['cache_loggedin'] == 0 ) { - if ( (substr($n, 0, 14) == 'wordpressuser_' || substr($n, 0, 10) == 'wordpress_' || substr($n, 0, 12) == 'wp-postpass_') && !$wp_ffpc_config['cache_loggedin'] ) { - return false; - } - } - /* check for any matches to user-added cookies to no-cache */ - if ( ! empty( $nocache_cookies ) ){ - foreach ( $nocache_cookies as $nocache_cookie ) { - if( strpos( $n, $nocache_cookie ) === 0 ) { - return false; - } - } + if ( (substr($n, 0, 14) == 'wordpressuser_' || substr($n, 0, 10) == 'wordpress_' || substr($n, 0, 12) == 'wp-postpass_') && !$wp_ffpc_config['cache_loggedin'] ) { + return false; } } } - /* canonical redirect storage */ $wp_ffpc_redirect = null; @@ -163,7 +146,7 @@ if ( !empty( $wp_ffpc_values['meta']['pingback'] ) ) /* for debugging */ if ( $wp_ffpc_config['response_header'] ) - header( 'X-Cache-Engine: WP-FFPC with ' . $wp_ffpc_config['cache_type'] .' via PHP'); + header( 'X-Cache-Engine: WP-FFPC with ' . $wp_ffpc_config['cache_type'] ); /* HTML data */ echo $wp_ffpc_values['data']; diff --git a/wp-ffpc-class.php b/wp-ffpc-class.php index 6d841a7..811158f 100644 --- a/wp-ffpc-class.php +++ b/wp-ffpc-class.php @@ -391,7 +391,7 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
- If you are caching with nginx, you should update your nginx configuration and reload nginx after changing this value.', $this->plugin_constant); ?> + plugin_constant); ?>
@@ -420,7 +420,7 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['log_info'],true); ?> /> - plugin_constant); ?> + plugin_constant); ?>
@@ -440,7 +440,7 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
- +
options['sync_protocols'],true); ?> /> @@ -501,14 +501,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) { options['nocache_page'],true); ?> /> plugin_constant); ?>
- -
- -
-
- - If you are caching with nginx, you should update your nginx configuration and reload nginx after changing this value.', $this->plugin_constant); ?> -
@@ -527,7 +519,7 @@ if ( ! class_exists( 'WP_FFPC' ) ) {
options['persistent'],true); ?> /> - plugin_constant); ?> + plugin_constant); ?>
@@ -792,27 +784,6 @@ if ( ! class_exists( 'WP_FFPC' ) ) { else $nginx = str_replace ( 'LOGGEDIN_EXCEPTION' , '' , $nginx ); - /* nginx can skip caching for visitors with certain cookies specified in the options */ - if( $this->options['nocache_cookies'] ) { - $cookies = str_replace( ",","|", $this->options['nocache_cookies'] ); - $cookies = str_replace( " ","", $cookies ); - $cookie_exception = '# avoid cache for cookies specified - if ($http_cookie ~* ' . $cookies . ' ) { - set $memcached_request 0; - }'; - $nginx = str_replace ( 'COOKIES_EXCEPTION' , $cookie_exception , $nginx ); - } else { - $nginx = str_replace ( 'COOKIES_EXCEPTION' , '' , $nginx ); - } - - /* add custom response header if specified in the options */ - if( $this->options['response_header'] ){ - $response_header = 'add_header X-Cache-Engine "WP-FFPC with ' . $this->options['cache_type'] .' via nginx";'; - $nginx = str_replace ( 'RESPONSE_HEADER' , $response_header , $nginx ); - } else{ - $nginx = str_replace ( 'RESPONSE_HEADER' , '' , $nginx ); - } - return $nginx; } diff --git a/wp-ffpc-nginx-sample.conf b/wp-ffpc-nginx-sample.conf index 372b8f9..16817f3 100644 --- a/wp-ffpc-nginx-sample.conf +++ b/wp-ffpc-nginx-sample.conf @@ -144,10 +144,7 @@ MEMCACHED_SERVERS LOGGEDIN_EXCEPTION - COOKIES_EXCEPTION - if ( $memcached_request = 1) { - RESPONSE_HEADER memcached_pass memcached-servers; error_page 404 = @rewrites; } @@ -159,7 +156,6 @@ MEMCACHED_SERVERS ## rewrite rules location @rewrites { - add_header X-Cache-Engine ""; rewrite ^ /index.php?$args last; } diff --git a/wp-ffpc.php b/wp-ffpc.php index 8a18386..6008330 100644 --- a/wp-ffpc.php +++ b/wp-ffpc.php @@ -43,7 +43,6 @@ $wp_ffpc_defaults = array ( 'nocache_archive' => false, 'nocache_single' => false, 'nocache_page' => false, - 'nocache_cookies' => false, 'sync_protocols' => false, 'persistent' => false, 'response_header' => false,