Changeset 2711432

Timestamp:

04/19/2022 08:31:38 AM (4 years ago)

Author:

kovshenin

Message:

Release 1.0.4

Location:

surge/trunk

Files:

• include/cache.php (modified) (1 diff)
• include/cli.php (added)
• include/common.php (modified) (2 diffs)
• include/cron.php (modified) (1 diff)
• include/install.php (modified) (1 diff)
• include/invalidate.php (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• surge.php (modified) (2 diffs)

surge/trunk/include/cache.php

@@ -28 +28 @@
 
     $skip = false;
+    $headers = [];
 
     foreach ( headers_list() as $header ) {

surge/trunk/include/common.php

@@ -44 +44 @@
             'matomo_group', 'matomo_placement', 'hsa_cam', 'hsa_grp', 'hsa_mt',
             'hsa_src', 'hsa_ad', 'hsa_acc', 'hsa_net', 'hsa_kw', 'hsa_tgt',
-            'hsa_ver', '_branch_match_id',
+            'hsa_ver', '_branch_match_id'
         ],
 
@@ -98 +98 @@
     }
 
+    $unset_vars = [];
+
     // Ignore some query vars.
     foreach ( $query_vars as $key => $value ) {
         if ( in_array( $key, config( 'ignore_query_vars' ) ) ) {
+            $unset_vars[] = $key;
             unset( $query_vars[ $key ] );
+            unset( $_REQUEST[ $key ] );
+            unset( $_GET[ $key ] );
+        }
+    }
+
+    // Clean REQUEST_URI
+    if ( ! empty( $unset_vars ) ) {
+        $unset_vars_regex = implode( '|', array_map( 'preg_quote', $unset_vars ) );
+        $_SERVER['REQUEST_URI'] = preg_replace( "#(\?)?&?({$unset_vars_regex})=[^&]+#", '\\1', $_SERVER['REQUEST_URI'] );
+        $_SERVER['REQUEST_URI'] = str_replace( '?&', '?', $_SERVER['REQUEST_URI'] );
+        if ( $_SERVER['REQUEST_URI'] == '/?' ) {
+            $_SERVER['REQUEST_URI'] = '/';
         }
     }

surge/trunk/include/cron.php

@@ -47 +47 @@
 
     foreach ( $files as $filename ) {
-        $stat = stat( $filename );
+        // Some files after scandir may already be gone/renamed.
+        $stat = @stat( $filename );
+        if ( ! $stat ) {
+            continue;
+        }
 
         // Skip files modified in the last minute.

surge/trunk/include/install.php

@@ -28 +28 @@
 wp_mkdir_p( CACHE_DIR );
 
-// Nothing to do if WP_CACHE is already on.
-if ( defined( 'WP_CACHE' ) && WP_CACHE ) {
+// Nothing to do if WP_CACHE is already on or forced skip.
+if ( defined( 'WP_CACHE' ) && WP_CACHE || apply_filters( 'surge_skip_config_update', false ) ) {
     update_option( 'surge_installed', 1 );
     return;

surge/trunk/include/invalidate.php

@@ -135 +135 @@
     $flags = null;
     $path = CACHE_DIR . '/flags.json.php';
-    $mode = file_exists( $path ) ? 'r+' : 'w+';
+    $exists = file_exists( $path );
+    $mode = $exists ? 'r+' : 'w+';
+
+    // Make sure cache dir exists.
+    if ( ! $exists && ! wp_mkdir_p( CACHE_DIR ) ) {
+        return;
+    }
+
     $f = fopen( $path, $mode );
     $length = filesize( $path );

surge/trunk/readme.txt

@@ -4 +4 @@
 Tags: cache, performance, caching
 Requires at least: 5.7
-Tested up to: 5.9
+Tested up to: 6.0
 Requires PHP: 7.3
-Stable tag: 1.0.3
+Stable tag: 1.0.4
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
@@ -36 +36 @@
 There isn't one.
 
+= How do I clear the cache? =
+
+Toggle the plugin activation or run `wp surge flush` using WP-CLI.
+
 = Is my cache working? =
 
@@ -63 +67 @@
 == Changelog ==
 
+= 1.0.4 =
+* Add a WP-CLI command to invalidate/flush page cache
+* Fix redirect loop with Core's redirect_canonical for ignore_query_vars
+* Fix warnings for requests with empty headers
+* Fix warnings when cron cleanup attempts to read a file that no longer exists
+* Add a filter to disable writing to wp-config.php
+
 = 1.0.3 =
 * Invalidate cache when posts_per_page is changed

surge/trunk/surge.php

@@ -8 +8 @@
  * Text Domain: surge
  * Domain Path: /languages
- * Version: 1.0.3
+ * Version: 1.0.4
  *
  * @package Surge
@@ -30 +30 @@
     if ( wp_doing_cron() ) {
         include_once( __DIR__ . '/include/cron.php' );
+    }
+
+    if ( defined( 'WP_CLI' ) && WP_CLI ) {
+        include_once( __DIR__ . '/include/cli.php' );
     }