From ef4baf95c6769b893a7207f22afa9c6ad3753f51 Mon Sep 17 00:00:00 2001
From: Peter Molnar <hello@petermolnar.eu>
Date: Thu, 4 Sep 2014 09:47:09 +0100
Subject: [PATCH 1/3] wp-common updates

---
 wp-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-common b/wp-common
index d84ff21..d8ed40a 160000
--- a/wp-common
+++ b/wp-common
@@ -1 +1 @@
-Subproject commit d84ff213cd944c22a6a440d6faba502abd1da774
+Subproject commit d8ed40adaae8be884a4dd14e5744183f4d183640

From 8eab1f88ce4e5a3193cf2358a5b0b149f1773304 Mon Sep 17 00:00:00 2001
From: Peter Molnar <hello@petermolnar.eu>
Date: Thu, 4 Sep 2014 10:49:14 +0100
Subject: [PATCH 2/3] removing unneeded { left in the code accidentally and
 which prevented WordPress SVN commit

---
 wp-ffpc-acache.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/wp-ffpc-acache.php b/wp-ffpc-acache.php
index 904f346..b93f434 100644
--- a/wp-ffpc-acache.php
+++ b/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;
 
 /* no cache for pages starting with /wp- like WP admin */
@@ -38,9 +38,8 @@ 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() )
-		return false;
+if ( function_exists('is_multisite') && stripos($wp_ffpc_uri, '/files/') && is_multisite() )
+	return false;
 
 /* check if config is network active: use network config */
 if (!empty ( $wp_ffpc_config['network'] ) )
@@ -125,13 +124,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();
 }
@@ -142,6 +144,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();
 	}

From b2367f2fe42b1f54e9a3bd7835eb272387991449 Mon Sep 17 00:00:00 2001
From: Peter Molnar <hello@petermolnar.eu>
Date: Thu, 4 Sep 2014 10:54:00 +0100
Subject: [PATCH 3/3] 1.6.1 to correct SVN madness

---
 readme.txt  | 7 ++++++-
 wp-ffpc.php | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index ffa8f50..d8f9d29 100644
--- a/readme.txt
+++ b/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*
 
diff --git a/wp-ffpc.php b/wp-ffpc.php
index d5285eb..3ebe0ba 100644
--- a/wp-ffpc.php
+++ b/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