[Boost] Fix atomic caching (#31692)

* Add a cachebuster, and rtrim minified content * changelog * Don't send content-length at all; it breaks on atomic' --------- Co-authored-by: Mark George <[email protected]>
Automattic · Jul 5, 2023 · 5e2e6c6 · 5e2e6c6
1 parent 800c77c
commit 5e2e6c6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/projects/plugins/boost/app/lib/minify/Concatenate_CSS.php b/projects/plugins/boost/app/lib/minify/Concatenate_CSS.php
@@ -169,7 +169,7 @@ public function do_items( $handles = false, $group = false ) {
 					} else {
 						$path_str = implode( ',', $css );
 					}
-					$path_str = "$path_str?m=$mtime";
+					$path_str = "$path_str?m=$mtime&cb=" . jetpack_boost_minify_cache_buster();
 
 					if ( $this->allow_gzip_compression ) {
 						// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode

diff --git a/projects/plugins/boost/app/lib/minify/Concatenate_JS.php b/projects/plugins/boost/app/lib/minify/Concatenate_JS.php
@@ -228,7 +228,7 @@ public function do_items( $handles = false, $group = false ) {
 					} else {
 						$path_str = implode( ',', $js_array['paths'] );
 					}
-					$path_str = "$path_str?m=$mtime";
+					$path_str = "$path_str?m=$mtime&cb=" . jetpack_boost_minify_cache_buster();
 
 					if ( $this->allow_gzip_compression ) {
 						// phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode

diff --git a/projects/plugins/boost/app/lib/minify/functions-helpers.php b/projects/plugins/boost/app/lib/minify/functions-helpers.php
@@ -3,6 +3,14 @@
 use Automattic\Jetpack_Boost\Lib\Minify\Config;
 use Automattic\Jetpack_Boost\Lib\Minify\Dependency_Path_Mapping;
 
+/**
+ * Get an extra cache key for requests. We can manually bump this when we want
+ * to ensure a new version of Jetpack Boost never reuses old cached URLs.
+ */
+function jetpack_boost_minify_cache_buster() {
+	return 1;
+}
+
 /**
  * Cleanup the given cache folder, removing all files older than $file_age seconds.
  *

diff --git a/projects/plugins/boost/app/lib/minify/functions-service.php b/projects/plugins/boost/app/lib/minify/functions-service.php
@@ -314,9 +314,12 @@ function ( $match ) use ( $dirpath, &$pre_output ) {
 		}
 	}
 
+	// Don't let trailing whitespace ruin everyone's day. Seems to get stripped by batcache
+	// resulting in ns_error_net_partial_transfer errors.
+	$output = rtrim( $output );
+
 	$headers = array(
 		'Last-Modified: ' . gmdate( 'D, d M Y H:i:s', $last_modified ) . ' GMT',
-		'Content-Length: ' . ( strlen( $pre_output ) + strlen( $output ) ),
 		"Content-Type: $mime_type",
 	);
 

diff --git a/projects/plugins/boost/changelog/fix-atomic-caching b/projects/plugins/boost/changelog/fix-atomic-caching
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Minify CSS/JS: Fixed an odd caching issue on Atomic hosts