Changeset 3358113

Timestamp:

09/08/2025 06:23:01 PM (7 months ago)

Author:

peterarends

Message:

Tagging version 1.1.1

Location:

simple-page-cache/trunk

Files:

• readme.txt (modified) (2 diffs)
• simple-page-cache.php (modified) (11 diffs)

simple-page-cache/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.0
 Tested up to: 6.8
-Stable tag: 1.1.0
+Stable tag: 1.1.1
 License: GPLv2 or later
 
@@ -109 +109 @@
 
 == Changelog ==
+= 1.1.1 =
+* **Bug fix**: Fixed 404 errors when browsing the website while logged in
+* **Query parameter handling**: Plugin now properly checks for $_GET parameters and skips caching for requests with query strings
+
 = 1.1.0 =
 * **Path-based cache structure**: Cache files now use `/host/path/index.html` structure for nginx direct serving

simple-page-cache/trunk/simple-page-cache.php

@@ -3 +3 @@
 Plugin Name: Simple Page Cache
 Description: Extremely simple page cache to disk for non-logged-in users. No expiry, only clears on manual action. 
-Version: 1.1.0
+Version: 1.1.1
 Requires at least: 5.0
 Tested up to: 6.8
@@ -40 +40 @@
 }
 
-// Only cache for non-logged-in users and only GET requests
+// Only cache for non-logged-in users and only GET requests without query parameters
 function simplepagecache_should_cache()
 {
-    return !is_user_logged_in() && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'GET';
+    // Don't cache if user is logged in
+    if (is_user_logged_in()) {
+        return false;
+    }
+    
+    // Don't cache if not a GET request
+    if (!isset($_SERVER['REQUEST_METHOD']) || $_SERVER['REQUEST_METHOD'] !== 'GET') {
+        return false;
+    }
+    
+    // Don't cache if there are query parameters
+    if (!empty($_GET)) {
+        return false;
+    }
+    
+    return true;
 }
 
@@ -285 +300 @@
     # MUST end with a trailing slash. This is the *real* filesystem path where
     # your plugin writes cache files using the <host>/<uri>/index.html layout.
-    alias " . $cache_abs_path . "/;
+    alias " . rtrim($cache_abs_path, "/") . "/;
 
     # Optional debug headers (remove in production if you don't want to expose paths)
@@ -291 +306 @@
     #add_header simple-page-cache-file \$request_filename always;
 
-    # We expect the internal rewrite to point to an existing file under alias.
-    # If it doesn't exist for some reason, fail closed with 404.
+    # Only serve existing files under alias. Anything else -> 404.
     try_files \$uri =404;
 }
@@ -300 +314 @@
 #   - \"/\" (home), \"/about\", \"/blog/\", \"/foo/bar\" (extensionless URLs)
 #   - Does NOT match assets like \".css\", \".js\", \".png\", \".xml\", etc. (they contain a dot)
+#   - Does NOT match urls containingwp-admin
 #
 # Behavior:
@@ -305 +320 @@
 #   2) Bypass cache if query string is present or user is logged in.
 #   3) If the file exists -> internal rewrite to /__simple-page-cache__/... to serve it.
-#   4) Otherwise: do nothing here; request will continue and be handled by your
-#      existing locations (e.g., your current `location /` → WordPress fallback).
-location ~ ^/[^.]*$ {
+#   4) On MISS/BYPASS -> hand off directly to WordPress front controller.
+location ~* ^/(?!.*wp-admin)[^.]*$ {
     # Absolute cache root and default file name
-    set \$simple_page_cache_root " . $cache_abs_path . "/;
-    set \$simple_page_cache_index index.html;
-
-    # Build:
-    #   - \$simple_page_cache_abs : absolute filesystem path to the cache candidate
-    #   - \$simple_page_cache_rel : internal URI that maps to the same file via /__simple-page-cache__/ + alias
-    #
-    # Layout on disk (produced by your drop-in):
-    #   <cache_root>/<host><uri>/index.html
-    set \$simple_page_cache_abs  \$simple_page_cache_root\$host\$uri/\$simple_page_cache_index;
-    set \$simple_page_cache_rel  /__simple-page-cache__/\$host\$uri/\$simple_page_cache_index;
+
+    # Absolute on-disk candidate and the internal URI to serve it
+    set \$simple_page_cache_abs " . rtrim($cache_abs_path, "/") . "/\$host\$uri/index.html;
+    set \$simple_page_cache_rel /__simple-page-cache__/\$host\$uri/index.html;
 
     # Bypass cache if:
     #  - the request has a query string (we don't cache query variants), OR
     #  - the user is logged in (WordPress logged-in cookie).
-    # We do this by clearing \$simple_page_cache_abs so the -f check fails and we won't rewrite.
-    if (\$args != \"\") { set \$simple_page_cache_abs \"\"; }
-    if (\$http_cookie ~* \"wordpress_logged_in_\") { set \$simple_page_cache_abs \"\"; }
+    # Clear BOTH vars so we never jump to the internal serve location on MISS.
+    if (\$args != \"\")                            { set \$simple_page_cache_abs \"\"; set \$simple_page_cache_rel \"\"; }
+    if (\$http_cookie ~* \"wordpress_logged_in_\") { set \$simple_page_cache_abs \"\"; set \$simple_page_cache_rel \"\"; }
 
     # Cache HIT:
@@ -335 +342 @@
     }
 
-    # Cache MISS or bypass:
-
-    try_files \$uri \$uri/ /index.php?\$args;
+    # MISS/BYPASS -> explicitly hand off to WordPress front controller
+    # No FastCGI params here; your existing PHP handler will catch /index.php
+    rewrite ^ /index.php\$is_args\$args last;
 }
 
@@ -343 +350 @@
 # 1. Add the above configuration to your nginx server block for " . $host . "
 # 2. Reload nginx: sudo nginx -t && sudo systemctl reload nginx
-# 3. Test by visiting your site - cached pages should be served directly by nginx
-# 4. Check nginx access logs to see cache hits (look for 'simple-page-cache-webserver: Hit' header)
-# 5. Remove debug headers in production by commenting out the add_header lines above
+# 3. Test by visiting your site — cached pages should be served directly by nginx
+# 4. Check in your browser (private/incognito mode) to see if the cache is working (look for 'simple-page-cache-webserver: Hit' header)
+# 5. Uncomment additional add_header lines to debug further or enjoy your faster site!
 ";
+
 
     return $nginx_config;
@@ -365 +373 @@
         . "    }\n"
         . "}\n"
-        . "if (!isset(\$_SERVER['REQUEST_METHOD']) || \$_SERVER['REQUEST_METHOD'] !== 'GET') return;\n\n"
+        . "if (!isset(\$_SERVER['REQUEST_METHOD']) || \$_SERVER['REQUEST_METHOD'] !== 'GET') return;\n"
+        . "if (!empty(\$_GET)) return;\n\n"
         . "\$settings_file = '" . $settings_dir . $settings_filename . "';\n"
         . "\$settings = [];\n"
@@ -500 +509 @@
         'cache_dir' => $cache_dir,
         'exclude_uris' => [],
-        'plugin_version' => '1.1.0'
+        'plugin_version' => '1.1.1'
     ];
     file_put_contents($settings_file, json_encode($settings, JSON_PRETTY_PRINT));
@@ -552 +561 @@
             $settings = json_decode($settings_content, true);
             if (is_array($settings)) {
-                $current_version = '1.1.0'; // Current plugin version
+                $current_version = '1.1.1'; // Current plugin version
                 $saved_version = $settings['plugin_version'] ?? '0.0';