Merge branch 'master' of /private/var/www/wp-ffpc-upstream

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: cache, page cache, full page cache, nginx, memcached, apc, speed
 Requires at least: 3.0
 Tested up to: 4.0
-Stable tag: 1.6.0
+Stable tag: 1.6.1
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -106,6 +106,11 @@ Version numbering logic:
 * every .B version indicates new features.
 * every ..C indicates bugfixes for A.B version.
 
+= 1.6.1 =
+*2014-09-04*
+
+1.6 release, correcting SVN madness with non-recursive copies.
+
 = 1.6.0 =
 *2014-05-30*
 

wp-common

@@ -1 +1 @@
-Subproject commit d84ff213cd944c22a6a440d6faba502abd1da774
+Subproject commit d8ed40adaae8be884a4dd14e5744183f4d183640

wp-ffpc-acache.php

@@ -26,7 +26,7 @@ if (defined('SID') && SID != '')
 $wp_ffpc_uri = $_SERVER['REQUEST_URI'];
 
 /* no cache for uri with query strings, things usually go bad that way */
-if ( isset($wp_ffpc_config['nocache_dyn']) && !empty($wp_ffpc_config['nocache_dyn']) && stripos($wp_ffpc_uri, '?') !== false ) {
+if ( isset($wp_ffpc_config['nocache_dyn']) && !empty($wp_ffpc_config['nocache_dyn']) && stripos($wp_ffpc_uri, '?') !== false )
 	return false;
 }
 
@@ -39,8 +39,7 @@ if ( stripos($wp_ffpc_uri, 'robots.txt') )
 	return false;
 
 /* multisite files can be too large for memcached */
-if ( function_exists('is_multisite') && stripos($wp_ffpc_uri, '/files/') )
-	if ( is_multisite() )
+if ( function_exists('is_multisite') && stripos($wp_ffpc_uri, '/files/') && is_multisite() )
 	return false;
 
 /* check if config is network active: use network config */
@@ -126,13 +125,16 @@ foreach ( $wp_ffpc_keys as $internal => $key ) {
 /* serve cache 404 status */
 if ( isset( $wp_ffpc_values['meta']['status'] ) &&  $wp_ffpc_values['meta']['status'] == 404 ) {
 	header("HTTP/1.1 404 Not Found");
-//	flush();
-//	die();
+	/* if I kill the page serving here, the 404 page will not be showed at all, so we do not do that
+	 * flush();
+	 * die();
+	 */
 }
 
 /* server redirect cache */
 if ( isset( $wp_ffpc_values['meta']['redirect'] ) && $wp_ffpc_values['meta']['redirect'] ) {
 	header('Location: ' . $wp_ffpc_values['meta']['redirect'] );
+	/* cut the connection as fast as possible */
 	flush();
 	die();
 }
@@ -143,6 +145,7 @@ if ( array_key_exists( "HTTP_IF_MODIFIED_SINCE" , $_SERVER ) && !empty( $wp_ffpc
 	/* check is cache is still valid */
 	if ( $if_modified_since >= $wp_ffpc_values['meta']['lastmodified'] ) {
 		header("HTTP/1.0 304 Not Modified");
+		/* connection cut for faster serving */
 		flush();
 		die();
 	}

wp-ffpc.php

@@ -3,7 +3,7 @@
 Plugin Name: WP-FFPC
 Plugin URI: https://github.com/petermolnar/wp-ffpc
 Description: WordPress in-memory full page cache plugin
-Version: 1.6.0
+Version: 1.6.1
 Author: Peter Molnar <hello@petermolnar.eu>
 Author URI: http://petermolnar.eu/
 License: GPLv3