Changeset 2977143

Timestamp:

10/10/2023 05:02:18 PM (2 years ago)

Author:

LiteSpeedTech

Message:

Release v5.7

Location:

litespeed-cache

Files:

• tags/5.7 (added)
• tags/5.7/LICENSE (added)
• tags/5.7/assets (added)
• tags/5.7/assets/css (added)
• tags/5.7/assets/css/fonts (added)
• tags/5.7/assets/css/fonts/litespeedfont.eot (added)
• tags/5.7/assets/css/fonts/litespeedfont.svg (added)
• tags/5.7/assets/css/fonts/litespeedfont.ttf (added)
• tags/5.7/assets/css/fonts/litespeedfont.woff (added)
• tags/5.7/assets/css/iziModal.min.css (added)
• tags/5.7/assets/css/litespeed-legacy.css (added)
• tags/5.7/assets/css/litespeed.css (added)
• tags/5.7/assets/img (added)
• tags/5.7/assets/img/Litespeed.icon.svg (added)
• tags/5.7/assets/img/iconlscwp.svg (added)
• tags/5.7/assets/img/icons (added)
• tags/5.7/assets/img/icons/all.svg (added)
• tags/5.7/assets/img/icons/all_transients.svg (added)
• tags/5.7/assets/img/icons/auto_draft.svg (added)
• tags/5.7/assets/img/icons/cross_icon.svg (added)
• tags/5.7/assets/img/icons/db.svg (added)
• tags/5.7/assets/img/icons/empty-cache.svg (added)
• tags/5.7/assets/img/icons/expired_transient.svg (added)
• tags/5.7/assets/img/icons/img_optm.svg (added)
• tags/5.7/assets/img/icons/img_optm_disabled.svg (added)
• tags/5.7/assets/img/icons/img_webp.svg (added)
• tags/5.7/assets/img/icons/img_webp_disabled.svg (added)
• tags/5.7/assets/img/icons/optimize_tables.svg (added)
• tags/5.7/assets/img/icons/purge-403.svg (added)
• tags/5.7/assets/img/icons/purge-404.svg (added)
• tags/5.7/assets/img/icons/purge-500.svg (added)
• tags/5.7/assets/img/icons/purge-all.svg (added)
• tags/5.7/assets/img/icons/purge-cssjs.svg (added)
• tags/5.7/assets/img/icons/purge-front.svg (added)
• tags/5.7/assets/img/icons/purge-object.svg (added)
• tags/5.7/assets/img/icons/purge-opcache.svg (added)
• tags/5.7/assets/img/icons/purge-pages.svg (added)
• tags/5.7/assets/img/icons/revision.svg (added)
• tags/5.7/assets/img/icons/spam_comment.svg (added)
• tags/5.7/assets/img/icons/success_icon.svg (added)
• tags/5.7/assets/img/icons/trackback-pingback.svg (added)
• tags/5.7/assets/img/icons/trash_comment.svg (added)
• tags/5.7/assets/img/icons/trash_post.svg (added)
• tags/5.7/assets/img/lscwp-logo_90x90.png (added)
• tags/5.7/assets/img/lscwp_blue_font-icon_22px.svg (added)
• tags/5.7/assets/img/lscwp_font-icon_32px.svg (added)
• tags/5.7/assets/img/lscwp_gray-yellow_font-icon_22px.svg (added)
• tags/5.7/assets/img/lscwp_gray_font-icon_22px.svg (added)
• tags/5.7/assets/img/lscwp_grayscale_font-icon_22px.svg (added)
• tags/5.7/assets/img/quic-cloud-icon-16x16.svg (added)
• tags/5.7/assets/img/quic-cloud-logo-light_stack_300px.png (added)
• tags/5.7/assets/img/quic-cloud-logo.svg (added)
• tags/5.7/assets/img/slack-logo.png (added)
• tags/5.7/assets/js (added)
• tags/5.7/assets/js/babel.min.js (added)
• tags/5.7/assets/js/component.cdn.js (added)
• tags/5.7/assets/js/component.crawler.js (added)
• tags/5.7/assets/js/css_async.js (added)
• tags/5.7/assets/js/css_async.min.js (added)
• tags/5.7/assets/js/guest.docref.js (added)
• tags/5.7/assets/js/guest.docref.min.js (added)
• tags/5.7/assets/js/guest.js (added)
• tags/5.7/assets/js/guest.min.js (added)
• tags/5.7/assets/js/instant_click.min.js (added)
• tags/5.7/assets/js/instant_click.ori.js (added)
• tags/5.7/assets/js/iziModal.min.js (added)
• tags/5.7/assets/js/js_delay.js (added)
• tags/5.7/assets/js/js_delay.min.js (added)
• tags/5.7/assets/js/lazyload.init.js (added)
• tags/5.7/assets/js/lazyload.lib.js (added)
• tags/5.7/assets/js/lazyload.min.js (added)
• tags/5.7/assets/js/litespeed-cache-admin.js (added)
• tags/5.7/assets/js/react.min.js (added)
• tags/5.7/assets/js/webfontloader.js (added)
• tags/5.7/assets/js/webfontloader.min.js (added)
• tags/5.7/autoload.php (added)
• tags/5.7/cli (added)
• tags/5.7/cli/debug.cls.php (added)
• tags/5.7/cli/image.cls.php (added)
• tags/5.7/cli/online.cls.php (added)
• tags/5.7/cli/option.cls.php (added)
• tags/5.7/cli/presets.cls.php (added)
• tags/5.7/cli/purge.cls.php (added)
• tags/5.7/data (added)
• tags/5.7/data/.htaccess (added)
• tags/5.7/data/const.default.ini (added)
• tags/5.7/data/const.network_default.ini (added)
• tags/5.7/data/css_excludes.txt (added)
• tags/5.7/data/esi.nonce.txt (added)
• tags/5.7/data/esi.nonces.txt (added)
• tags/5.7/data/js_defer_excludes.txt (added)
• tags/5.7/data/js_excludes.txt (added)
• tags/5.7/data/optm_uri_exc.txt (added)
• tags/5.7/data/preset (added)
• tags/5.7/data/preset/advanced.data (added)
• tags/5.7/data/preset/aggressive.data (added)
• tags/5.7/data/preset/basic.data (added)
• tags/5.7/data/preset/essentials.data (added)
• tags/5.7/data/preset/extreme.data (added)
• tags/5.7/data/ucss_whitelist.txt (added)
• tags/5.7/guest.vary.php (added)
• tags/5.7/inc (added)
• tags/5.7/inc/object.lib.php (added)
• tags/5.7/lang (added)
• tags/5.7/lang/litespeed-cache.pot (added)
• tags/5.7/lib (added)
• tags/5.7/lib/css-min (added)
• tags/5.7/lib/css-min/colors.cls.php (added)
• tags/5.7/lib/css-min/minifier.cls.php (added)
• tags/5.7/lib/css-min/urirewriter.cls.php (added)
• tags/5.7/lib/css-min/utils.cls.php (added)
• tags/5.7/lib/guest.cls.php (added)
• tags/5.7/lib/html-min.cls.php (added)
• tags/5.7/lib/jsmin.cls.php (added)
• tags/5.7/lib/jsmin_data (added)
• tags/5.7/lib/jsmin_data/keywords_after.txt (added)
• tags/5.7/lib/jsmin_data/keywords_before.txt (added)
• tags/5.7/lib/jsmin_data/keywords_reserved.txt (added)
• tags/5.7/lib/jsmin_data/operators.txt (added)
• tags/5.7/lib/jsmin_data/operators_after.txt (added)
• tags/5.7/lib/jsmin_data/operators_before.txt (added)
• tags/5.7/lib/object-cache.php (added)
• tags/5.7/lib/php-compatibility.func.php (added)
• tags/5.7/litespeed-cache.php (added)
• tags/5.7/qc-ping.txt (added)
• tags/5.7/readme.txt (added)
• tags/5.7/src (added)
• tags/5.7/src/activation.cls.php (added)
• tags/5.7/src/admin-display.cls.php (added)
• tags/5.7/src/admin-settings.cls.php (added)
• tags/5.7/src/admin.cls.php (added)
• tags/5.7/src/api.cls.php (added)
• tags/5.7/src/avatar.cls.php (added)
• tags/5.7/src/base.cls.php (added)
• tags/5.7/src/cdn (added)
• tags/5.7/src/cdn-setup.cls.php (added)
• tags/5.7/src/cdn.cls.php (added)
• tags/5.7/src/cdn/cloudflare.cls.php (added)
• tags/5.7/src/cdn/quic.cls.php (added)
• tags/5.7/src/cloud.cls.php (added)
• tags/5.7/src/conf.cls.php (added)
• tags/5.7/src/control.cls.php (added)
• tags/5.7/src/core.cls.php (added)
• tags/5.7/src/crawler-map.cls.php (added)
• tags/5.7/src/crawler.cls.php (added)
• tags/5.7/src/css.cls.php (added)
• tags/5.7/src/data.cls.php (added)
• tags/5.7/src/data.upgrade.func.php (added)
• tags/5.7/src/data_structure (added)
• tags/5.7/src/data_structure/avatar.sql (added)
• tags/5.7/src/data_structure/crawler.sql (added)
• tags/5.7/src/data_structure/crawler_blacklist.sql (added)
• tags/5.7/src/data_structure/img_optm.sql (added)
• tags/5.7/src/data_structure/img_optming.sql (added)
• tags/5.7/src/data_structure/url.sql (added)
• tags/5.7/src/data_structure/url_file.sql (added)
• tags/5.7/src/db-optm.cls.php (added)
• tags/5.7/src/debug2.cls.php (added)
• tags/5.7/src/doc.cls.php (added)
• tags/5.7/src/error.cls.php (added)
• tags/5.7/src/esi.cls.php (added)
• tags/5.7/src/file.cls.php (added)
• tags/5.7/src/gui.cls.php (added)
• tags/5.7/src/health.cls.php (added)
• tags/5.7/src/htaccess.cls.php (added)
• tags/5.7/src/img-optm.cls.php (added)
• tags/5.7/src/import.cls.php (added)
• tags/5.7/src/instance.cls.php (added)
• tags/5.7/src/lang.cls.php (added)
• tags/5.7/src/localization.cls.php (added)
• tags/5.7/src/media.cls.php (added)
• tags/5.7/src/metabox.cls.php (added)
• tags/5.7/src/object-cache.cls.php (added)
• tags/5.7/src/object.lib.php (added)
• tags/5.7/src/optimize.cls.php (added)
• tags/5.7/src/optimizer.cls.php (added)
• tags/5.7/src/placeholder.cls.php (added)
• tags/5.7/src/preset.cls.php (added)
• tags/5.7/src/purge.cls.php (added)
• tags/5.7/src/report.cls.php (added)
• tags/5.7/src/rest.cls.php (added)
• tags/5.7/src/root.cls.php (added)
• tags/5.7/src/router.cls.php (added)
• tags/5.7/src/str.cls.php (added)
• tags/5.7/src/tag.cls.php (added)
• tags/5.7/src/task.cls.php (added)
• tags/5.7/src/tool.cls.php (added)
• tags/5.7/src/ucss.cls.php (added)
• tags/5.7/src/utility.cls.php (added)
• tags/5.7/src/vary.cls.php (added)
• tags/5.7/src/vpi.cls.php (added)
• tags/5.7/thirdparty (added)
• tags/5.7/thirdparty/aelia-currencyswitcher.cls.php (added)
• tags/5.7/thirdparty/amp.cls.php (added)
• tags/5.7/thirdparty/autoptimize.cls.php (added)
• tags/5.7/thirdparty/avada.cls.php (added)
• tags/5.7/thirdparty/bbpress.cls.php (added)
• tags/5.7/thirdparty/beaver-builder.cls.php (added)
• tags/5.7/thirdparty/caldera-forms.cls.php (added)
• tags/5.7/thirdparty/divi-theme-builder.cls.php (added)
• tags/5.7/thirdparty/elementor.cls.php (added)
• tags/5.7/thirdparty/entry.inc.php (added)
• tags/5.7/thirdparty/facetwp.cls.php (added)
• tags/5.7/thirdparty/gravity-forms.cls.php (added)
• tags/5.7/thirdparty/litespeed-check.cls.php (added)
• tags/5.7/thirdparty/nextgengallery.cls.php (added)
• tags/5.7/thirdparty/perfmatters.cls.php (added)
• tags/5.7/thirdparty/theme-my-login.cls.php (added)
• tags/5.7/thirdparty/user-switching.cls.php (added)
• tags/5.7/thirdparty/wc-pdf-product-vouchers.cls.php (added)
• tags/5.7/thirdparty/wcml.cls.php (added)
• tags/5.7/thirdparty/woo-paypal.cls.php (added)
• tags/5.7/thirdparty/woocommerce.cls.php (added)
• tags/5.7/thirdparty/woocommerce.content.tpl.php (added)
• tags/5.7/thirdparty/woocommerce.tab.tpl.php (added)
• tags/5.7/thirdparty/wp-polls.cls.php (added)
• tags/5.7/thirdparty/wp-postratings.cls.php (added)
• tags/5.7/thirdparty/wpdiscuz.cls.php (added)
• tags/5.7/thirdparty/wplister.cls.php (added)
• tags/5.7/thirdparty/wpml.cls.php (added)
• tags/5.7/thirdparty/wptouch.cls.php (added)
• tags/5.7/thirdparty/yith-wishlist.cls.php (added)
• tags/5.7/tpl (added)
• tags/5.7/tpl/banner (added)
• tags/5.7/tpl/banner/ajax.php (added)
• tags/5.7/tpl/banner/cloud_news.tpl.php (added)
• tags/5.7/tpl/banner/cloud_promo.tpl.php (added)
• tags/5.7/tpl/banner/new_version.php (added)
• tags/5.7/tpl/banner/new_version_dev.tpl.php (added)
• tags/5.7/tpl/banner/score.php (added)
• tags/5.7/tpl/banner/slack.php (added)
• tags/5.7/tpl/cache (added)
• tags/5.7/tpl/cache/entry.tpl.php (added)
• tags/5.7/tpl/cache/entry_network.tpl.php (added)
• tags/5.7/tpl/cache/more_settings_tip.tpl.php (added)
• tags/5.7/tpl/cache/network_settings-advanced.tpl.php (added)
• tags/5.7/tpl/cache/network_settings-browser.tpl.php (added)
• tags/5.7/tpl/cache/network_settings-cache.tpl.php (added)
• tags/5.7/tpl/cache/network_settings-excludes.tpl.php (added)
• tags/5.7/tpl/cache/network_settings-object.tpl.php (added)
• tags/5.7/tpl/cache/network_settings-purge.tpl.php (added)
• tags/5.7/tpl/cache/settings-advanced.tpl.php (added)
• tags/5.7/tpl/cache/settings-browser.tpl.php (added)
• tags/5.7/tpl/cache/settings-cache.tpl.php (added)
• tags/5.7/tpl/cache/settings-esi.tpl.php (added)
• tags/5.7/tpl/cache/settings-excludes.tpl.php (added)
• tags/5.7/tpl/cache/settings-object.tpl.php (added)
• tags/5.7/tpl/cache/settings-purge.tpl.php (added)
• tags/5.7/tpl/cache/settings-ttl.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.browser.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.cache_dropquery.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.cache_favicon.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.cache_mobile.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.cache_resources.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.exclude_cookies.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.exclude_useragent.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.login_cookie.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.object.tpl.php (added)
• tags/5.7/tpl/cache/settings_inc.purge_on_upgrade.tpl.php (added)
• tags/5.7/tpl/cdn (added)
• tags/5.7/tpl/cdn/auto_setup.tpl.php (added)
• tags/5.7/tpl/cdn/entry.tpl.php (added)
• tags/5.7/tpl/cdn/manage.tpl.php (added)
• tags/5.7/tpl/cdn/settings.tpl.php (added)
• tags/5.7/tpl/crawler (added)
• tags/5.7/tpl/crawler/blacklist.tpl.php (added)
• tags/5.7/tpl/crawler/entry.tpl.php (added)
• tags/5.7/tpl/crawler/map.tpl.php (added)
• tags/5.7/tpl/crawler/settings-general.tpl.php (added)
• tags/5.7/tpl/crawler/settings-simulation.tpl.php (added)
• tags/5.7/tpl/crawler/settings-sitemap.tpl.php (added)
• tags/5.7/tpl/crawler/summary.tpl.php (added)
• tags/5.7/tpl/dash (added)
• tags/5.7/tpl/dash/dashboard.tpl.php (added)
• tags/5.7/tpl/dash/entry.tpl.php (added)
• tags/5.7/tpl/dash/network_dash.tpl.php (added)
• tags/5.7/tpl/db_optm (added)
• tags/5.7/tpl/db_optm/entry.tpl.php (added)
• tags/5.7/tpl/db_optm/manage.tpl.php (added)
• tags/5.7/tpl/db_optm/settings.tpl.php (added)
• tags/5.7/tpl/esi.tpl.php (added)
• tags/5.7/tpl/esi_widget_edit.php (added)
• tags/5.7/tpl/general (added)
• tags/5.7/tpl/general/entry.tpl.php (added)
• tags/5.7/tpl/general/network_settings.tpl.php (added)
• tags/5.7/tpl/general/settings.tpl.php (added)
• tags/5.7/tpl/general/settings_inc.auto_upgrade.tpl.php (added)
• tags/5.7/tpl/general/settings_inc.guest.tpl.php (added)
• tags/5.7/tpl/general/settings_tuning.tpl.php (added)
• tags/5.7/tpl/img_optm (added)
• tags/5.7/tpl/img_optm/entry.tpl.php (added)
• tags/5.7/tpl/img_optm/network_settings.tpl.php (added)
• tags/5.7/tpl/img_optm/settings.media_webp.tpl.php (added)
• tags/5.7/tpl/img_optm/settings.tpl.php (added)
• tags/5.7/tpl/img_optm/summary.tpl.php (added)
• tags/5.7/tpl/inc (added)
• tags/5.7/tpl/inc/admin_footer.php (added)
• tags/5.7/tpl/inc/api_key.php (added)
• tags/5.7/tpl/inc/check_cache_disabled.php (added)
• tags/5.7/tpl/inc/check_if_network_disable_all.php (added)
• tags/5.7/tpl/inc/disabled_all.php (added)
• tags/5.7/tpl/inc/in_upgrading.php (added)
• tags/5.7/tpl/inc/metabox.php (added)
• tags/5.7/tpl/inc/modal.footer.php (added)
• tags/5.7/tpl/inc/modal.header.php (added)
• tags/5.7/tpl/inc/show_display_installed.php (added)
• tags/5.7/tpl/inc/show_error_cookie.php (added)
• tags/5.7/tpl/inc/show_rule_conflict.php (added)
• tags/5.7/tpl/page_optm (added)
• tags/5.7/tpl/page_optm/entry.tpl.php (added)
• tags/5.7/tpl/page_optm/settings_css.tpl.php (added)
• tags/5.7/tpl/page_optm/settings_html.tpl.php (added)
• tags/5.7/tpl/page_optm/settings_js.tpl.php (added)
• tags/5.7/tpl/page_optm/settings_localization.tpl.php (added)
• tags/5.7/tpl/page_optm/settings_media.tpl.php (added)
• tags/5.7/tpl/page_optm/settings_media_exc.tpl.php (added)
• tags/5.7/tpl/page_optm/settings_tuning.tpl.php (added)
• tags/5.7/tpl/page_optm/settings_tuning_css.tpl.php (added)
• tags/5.7/tpl/page_optm/settings_vpi.tpl.php (added)
• tags/5.7/tpl/presets (added)
• tags/5.7/tpl/presets/entry.tpl.php (added)
• tags/5.7/tpl/presets/standard.tpl.php (added)
• tags/5.7/tpl/toolbox (added)
• tags/5.7/tpl/toolbox/beta_test.tpl.php (added)
• tags/5.7/tpl/toolbox/edit_htaccess.tpl.php (added)
• tags/5.7/tpl/toolbox/entry.tpl.php (added)
• tags/5.7/tpl/toolbox/heartbeat.tpl.php (added)
• tags/5.7/tpl/toolbox/import_export.tpl.php (added)
• tags/5.7/tpl/toolbox/log_viewer.tpl.php (added)
• tags/5.7/tpl/toolbox/purge.tpl.php (added)
• tags/5.7/tpl/toolbox/report.tpl.php (added)
• tags/5.7/tpl/toolbox/settings-debug.tpl.php (added)
• trunk/assets/css/litespeed.css (modified) (1 diff)
• trunk/assets/img/quic-cloud-logo-light_stack_300px.png (added)
• trunk/assets/img/quic-cloud-logo.svg (added)
• trunk/data/const.default.ini (modified) (2 diffs)
• trunk/lang/litespeed-cache.pot (modified) (35 diffs)
• trunk/lib/guest.cls.php (modified) (12 diffs)
• trunk/litespeed-cache.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/src/admin-settings.cls.php (modified) (17 diffs)
• trunk/src/base.cls.php (modified) (2 diffs)
• trunk/src/cdn.cls.php (modified) (1 diff)
• trunk/src/cdn/quic.cls.php (modified) (6 diffs)
• trunk/src/cloud.cls.php (modified) (3 diffs)
• trunk/src/control.cls.php (modified) (1 diff)
• trunk/src/crawler.cls.php (modified) (1 diff)
• trunk/src/doc.cls.php (modified) (1 diff)
• trunk/src/esi.cls.php (modified) (57 diffs)
• trunk/src/htaccess.cls.php (modified) (2 diffs)
• trunk/src/img-optm.cls.php (modified) (3 diffs)
• trunk/src/lang.cls.php (modified) (1 diff)
• trunk/src/media.cls.php (modified) (1 diff)
• trunk/src/optimize.cls.php (modified) (6 diffs)
• trunk/thirdparty/litespeed-check.cls.php (modified) (9 diffs)
• trunk/thirdparty/woocommerce.cls.php (modified) (36 diffs)
• trunk/thirdparty/woocommerce.content.tpl.php (modified) (2 diffs)
• trunk/tpl/dash/dashboard.tpl.php (modified) (1 diff)
• trunk/tpl/page_optm/settings_html.tpl.php (modified) (1 diff)

litespeed-cache/trunk/assets/css/litespeed.css

@@ -298 +298 @@
 .litespeed-left20 {
     margin-left: 20px;
+}
+
+.litespeed-wrap .litespeed-bg-quic-cloud {
+    background: linear-gradient(rgba(230,242,242,1) 10%, rgba(250,255,255,1) 30%);
 }
 

litespeed-cache/trunk/data/const.default.ini

@@ -35 +35 @@
 Pingdom
 bot
+spider
 PTST
 HeadlessChrome'
@@ -391 +392 @@
 optm-dns_prefetch_ctrl = false
 
+; O_OPTM_DNS_PRECONNECT
+optm-dns_preconnect = ''
+
 optm-exc = ''
 

litespeed-cache/trunk/lang/litespeed-cache.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: LiteSpeed Cache 5.6\n"
+"Project-Id-Version: LiteSpeed Cache 5.7\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/litespeed-cache\n"
-"POT-Creation-Date: 2023-07-26 13:52:36+00:00\n"
+"POT-Creation-Date: 2023-10-10 13:10:37+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -72 +72 @@
 msgstr ""
 
-#: src/admin-display.cls.php:135 src/lang.cls.php:243
+#: src/admin-display.cls.php:135 src/lang.cls.php:244
 msgid "Crawler"
 msgstr ""
@@ -110 +110 @@
 #: src/admin-display.cls.php:238 src/admin-display.cls.php:900
 #: src/admin-display.cls.php:929 src/admin-display.cls.php:980
-#: src/doc.cls.php:31 tpl/cache/settings-cache.tpl.php:19
+#: src/doc.cls.php:32 tpl/cache/settings-cache.tpl.php:19
 #: tpl/cache/settings_inc.cache_mobile.tpl.php:71 tpl/cdn/settings.tpl.php:49
 #: tpl/page_optm/settings_css.tpl.php:189
@@ -206 +206 @@
 #: src/admin-display.cls.php:1180 tpl/cache/settings-esi.tpl.php:95
 #: tpl/page_optm/settings_css.tpl.php:192
-#: tpl/page_optm/settings_html.tpl.php:85
+#: tpl/page_optm/settings_html.tpl.php:106
 #: tpl/page_optm/settings_media.tpl.php:245
 #: tpl/page_optm/settings_media_exc.tpl.php:26
@@ -240 +240 @@
 msgstr ""
 
-#: src/admin-display.cls.php:1198 src/doc.cls.php:96
+#: src/admin-display.cls.php:1198 src/doc.cls.php:98
 msgid "One per line."
 msgstr ""
@@ -260 +260 @@
 msgstr ""
 
-#: src/admin-settings.cls.php:245 src/admin-settings.cls.php:279
+#: src/admin-settings.cls.php:270 src/admin-settings.cls.php:305
 msgid "Options saved."
 msgstr ""
@@ -327 +327 @@
 msgstr ""
 
-#: src/cdn-setup.cls.php:322 src/cloud.cls.php:820 src/cloud.cls.php:828
-#: src/cloud.cls.php:1235
+#: src/cdn-setup.cls.php:322 src/cloud.cls.php:822 src/cloud.cls.php:830
+#: src/cloud.cls.php:1237
 msgid "Message from QUIC.cloud server"
 msgstr ""
 
 #: src/cloud.cls.php:394 src/cloud.cls.php:407 src/cloud.cls.php:452
-#: src/cloud.cls.php:477 src/cloud.cls.php:625 src/cloud.cls.php:1204
+#: src/cloud.cls.php:477 src/cloud.cls.php:627 src/cloud.cls.php:1206
 msgid "Cloud Error"
 msgstr ""
@@ -345 +345 @@
 msgstr ""
 
-#: src/cloud.cls.php:584
+#: src/cloud.cls.php:585
 msgid "In order to use QC services, need a real domain name, cannot use an IP."
 msgstr ""
 
-#: src/cloud.cls.php:625
+#: src/cloud.cls.php:627
 msgid "Please try after %1$s for service %2$s."
 msgstr ""
 
-#: src/cloud.cls.php:715 src/cloud.cls.php:736
+#: src/cloud.cls.php:717 src/cloud.cls.php:738
 msgid "Failed to request via WordPress"
 msgstr ""
 
-#: src/cloud.cls.php:755
+#: src/cloud.cls.php:757
 msgid ""
 "Cloud server refused the current request due to unpulled images. Please pull "
@@ -363 +363 @@
 msgstr ""
 
-#: src/cloud.cls.php:760
+#: src/cloud.cls.php:762
 msgid ""
 "Your domain_key has been temporarily blocklisted to prevent abuse. You may "
@@ -369 +369 @@
 msgstr ""
 
-#: src/cloud.cls.php:767
+#: src/cloud.cls.php:769
 msgid ""
 "Cloud server refused the current request due to rate limiting. Please try "
@@ -375 +375 @@
 msgstr ""
 
-#: src/cloud.cls.php:775
+#: src/cloud.cls.php:777
 msgid "Redetected node"
 msgstr ""
 
-#: src/cloud.cls.php:783
+#: src/cloud.cls.php:785
 msgid ""
 "We are working hard to improve your online service experience. The service "
@@ -385 +385 @@
 msgstr ""
 
-#: src/cloud.cls.php:836
+#: src/cloud.cls.php:838
 msgid "Good news from QUIC.cloud server"
 msgstr ""
 
-#: src/cloud.cls.php:845
+#: src/cloud.cls.php:847
 msgid "%1$s plugin version %2$s required for this action."
 msgstr ""
 
-#: src/cloud.cls.php:902 src/cloud.cls.php:1224
+#: src/cloud.cls.php:904 src/cloud.cls.php:1226
 msgid "Failed to communicate with QUIC.cloud server"
 msgstr ""
 
-#: src/cloud.cls.php:945
+#: src/cloud.cls.php:947
 msgid ""
 "Site not recognized. Domain Key has been automatically removed. Please "
@@ -403 +403 @@
 msgstr ""
 
-#: src/cloud.cls.php:946 src/error.cls.php:48
+#: src/cloud.cls.php:948 src/error.cls.php:48
 msgid "Click here to set."
 msgstr ""
 
-#: src/cloud.cls.php:1014
+#: src/cloud.cls.php:1016
 msgid "Cannot request REST API, no token saved."
 msgstr ""
 
-#: src/cloud.cls.php:1040
+#: src/cloud.cls.php:1042
 msgid "Cloud REST Error"
 msgstr ""
 
-#: src/cloud.cls.php:1060
+#: src/cloud.cls.php:1062
 msgid "Unknown error."
 msgstr ""
 
-#: src/cloud.cls.php:1064
+#: src/cloud.cls.php:1066
 msgid "Contact QUIC.cloud support"
 msgstr ""
 
-#: src/cloud.cls.php:1066
+#: src/cloud.cls.php:1068
 msgid "Cloud REST API returned error: "
 msgstr ""
 
-#: src/cloud.cls.php:1243
+#: src/cloud.cls.php:1245
 msgid ""
 "Applied for Domain Key successfully. Please wait for result. Domain Key will "
@@ -433 +433 @@
 msgstr ""
 
-#: src/cloud.cls.php:1299
+#: src/cloud.cls.php:1301
 msgid ""
 "Congratulations, your Domain Key has been approved! The setting has been "
@@ -439 +439 @@
 msgstr ""
 
-#: src/cloud.cls.php:1395
+#: src/cloud.cls.php:1400
 msgid "QUIC.cloud account has been created and successfully linked."
 msgstr ""
 
-#: src/cloud.cls.php:1396
+#: src/cloud.cls.php:1401
 msgid "QUIC.cloud account has been successfully linked."
 msgstr ""
 
-#: src/cloud.cls.php:1404
+#: src/cloud.cls.php:1409
 msgid "Domain Key hash mismatch"
 msgstr ""
 
-#: src/cloud.cls.php:1530
+#: src/cloud.cls.php:1535
 msgid "Sync credit allowance with Cloud Server successfully."
 msgstr ""
@@ -573 +573 @@
 msgstr ""
 
-#: src/doc.cls.php:31
-msgid "This setting is passively %1$s due to %2$s!"
-msgstr ""
-
-#: src/doc.cls.php:44
+#: src/doc.cls.php:32
+msgid "This setting is %1$s for certain qualifying requests due to %2$s!"
+msgstr ""
+
+#: src/doc.cls.php:46
 msgid "This setting will regenerate crawler list and clear the disabled list!"
 msgstr ""
 
-#: src/doc.cls.php:56
+#: src/doc.cls.php:58
 msgid ""
 "This site utilizes caching in order to facilitate a faster response time and "
@@ -593 +593 @@
 msgstr ""
 
-#: src/doc.cls.php:57
+#: src/doc.cls.php:59
 msgid "Please see %s for more details."
 msgstr ""
 
-#: src/doc.cls.php:74 src/doc.cls.php:128 tpl/cdn/manage.tpl.php:67
+#: src/doc.cls.php:76 src/doc.cls.php:130 tpl/cdn/manage.tpl.php:67
 #: tpl/dash/dashboard.tpl.php:46 tpl/img_optm/summary.tpl.php:48
 #: tpl/inc/check_cache_disabled.php:42
@@ -603 +603 @@
 msgstr ""
 
-#: src/doc.cls.php:112
+#: src/doc.cls.php:114
 msgid "Both full and partial strings can be used."
 msgstr ""
 
-#: src/doc.cls.php:114
+#: src/doc.cls.php:116
 msgid "Both full URLs and partial strings can be used."
 msgstr ""
 
-#: src/doc.cls.php:127
+#: src/doc.cls.php:129
 msgid "This setting will edit the .htaccess file."
 msgstr ""
 
-#: src/doc.cls.php:141
+#: src/doc.cls.php:143
 msgid ""
 "For online services to work correctly, you must allowlist all %s server IPs."
 msgstr ""
 
-#: src/doc.cls.php:142
+#: src/doc.cls.php:144
 msgid ""
 "Before generating key, please verify all IPs on this list are allowlisted"
 msgstr ""
 
-#: src/doc.cls.php:143 tpl/general/settings.tpl.php:89
+#: src/doc.cls.php:145 tpl/general/settings.tpl.php:89
 msgid "Current Online Server IPs"
 msgstr ""
 
-#: src/doc.cls.php:156
+#: src/doc.cls.php:158
 msgid "The queue is processed asynchronously. It may take time."
 msgstr ""
@@ -878 +878 @@
 msgstr ""
 
-#: src/gui.cls.php:556 src/gui.cls.php:716 src/lang.cls.php:175
+#: src/gui.cls.php:556 src/gui.cls.php:716 src/lang.cls.php:176
 #: tpl/presets/standard.tpl.php:42 tpl/toolbox/purge.tpl.php:106
 msgid "Gravatar Cache"
@@ -980 +980 @@
 msgstr ""
 
-#: src/img-optm.cls.php:1209
+#: src/img-optm.cls.php:1215
 msgid "Destroy all optimization data successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1270 src/img-optm.cls.php:1332
+#: src/img-optm.cls.php:1278 src/img-optm.cls.php:1340
 msgid "Rescanned successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1332
+#: src/img-optm.cls.php:1340
 msgid "Rescanned %d images successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1397
+#: src/img-optm.cls.php:1405
 msgid "Calculated backups successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1489
+#: src/img-optm.cls.php:1497
 msgid "Removed backups successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1674
+#: src/img-optm.cls.php:1682
 msgid "Switched images successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1719 src/img-optm.cls.php:1765
+#: src/img-optm.cls.php:1727 src/img-optm.cls.php:1773
 msgid "Switched to optimized file successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1738
+#: src/img-optm.cls.php:1746
 msgid "Disabled WebP file successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1743
+#: src/img-optm.cls.php:1751
 msgid "Enabled WebP file successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1759
+#: src/img-optm.cls.php:1767
 msgid "Restored original file successfully."
 msgstr ""
 
-#: src/img-optm.cls.php:1816
+#: src/img-optm.cls.php:1824
 msgid "Reset the optimized data successfully."
 msgstr ""
@@ -1357 +1357 @@
 
 #: src/lang.cls.php:158
+msgid "DNS Preconnect"
+msgstr ""
+
+#: src/lang.cls.php:159
 msgid "CSS Excludes"
 msgstr ""
 
-#: src/lang.cls.php:159
+#: src/lang.cls.php:160
 msgid "JS Delayed Includes"
 msgstr ""
 
-#: src/lang.cls.php:160
+#: src/lang.cls.php:161
 msgid "JS Excludes"
 msgstr ""
 
-#: src/lang.cls.php:161
+#: src/lang.cls.php:162
 msgid "Remove Query Strings"
 msgstr ""
 
-#: src/lang.cls.php:162
+#: src/lang.cls.php:163
 msgid "Load Google Fonts Asynchronously"
 msgstr ""
 
-#: src/lang.cls.php:163
+#: src/lang.cls.php:164
 msgid "Remove Google Fonts"
 msgstr ""
 
-#: src/lang.cls.php:164
+#: src/lang.cls.php:165
 msgid "Critical CSS Rules"
 msgstr ""
 
-#: src/lang.cls.php:165
+#: src/lang.cls.php:166
 msgid "Separate CCSS Cache Post Types"
 msgstr ""
 
-#: src/lang.cls.php:166
+#: src/lang.cls.php:167
 msgid "Separate CCSS Cache URIs"
 msgstr ""
 
-#: src/lang.cls.php:167
+#: src/lang.cls.php:168
 msgid "JS Deferred / Delayed Excludes"
 msgstr ""
 
-#: src/lang.cls.php:168
+#: src/lang.cls.php:169
 msgid "Guest Mode JS Excludes"
 msgstr ""
 
-#: src/lang.cls.php:169 tpl/presets/standard.tpl.php:44
+#: src/lang.cls.php:170 tpl/presets/standard.tpl.php:44
 msgid "Remove WordPress Emoji"
 msgstr ""
 
-#: src/lang.cls.php:170 tpl/presets/standard.tpl.php:45
+#: src/lang.cls.php:171 tpl/presets/standard.tpl.php:45
 msgid "Remove Noscript Tags"
 msgstr ""
 
-#: src/lang.cls.php:171
+#: src/lang.cls.php:172
 msgid "URI Excludes"
 msgstr ""
 
-#: src/lang.cls.php:172
+#: src/lang.cls.php:173
 msgid "Optimize for Guests Only"
 msgstr ""
 
-#: src/lang.cls.php:173
+#: src/lang.cls.php:174
 msgid "Role Excludes"
 msgstr ""
 
-#: src/lang.cls.php:176
+#: src/lang.cls.php:177
 msgid "Gravatar Cache Cron"
 msgstr ""
 
-#: src/lang.cls.php:177
+#: src/lang.cls.php:178
 msgid "Gravatar Cache TTL"
 msgstr ""
 
-#: src/lang.cls.php:179
+#: src/lang.cls.php:180
 msgid "Lazy Load Images"
 msgstr ""
 
-#: src/lang.cls.php:180
+#: src/lang.cls.php:181
 msgid "Lazy Load Image Excludes"
 msgstr ""
 
-#: src/lang.cls.php:181
+#: src/lang.cls.php:182
 msgid "Lazy Load Image Class Name Excludes"
 msgstr ""
 
-#: src/lang.cls.php:182
+#: src/lang.cls.php:183
 msgid "Lazy Load Image Parent Class Name Excludes"
 msgstr ""
 
-#: src/lang.cls.php:183
+#: src/lang.cls.php:184
 msgid "Lazy Load Iframe Class Name Excludes"
 msgstr ""
 
-#: src/lang.cls.php:184
+#: src/lang.cls.php:185
 msgid "Lazy Load Iframe Parent Class Name Excludes"
 msgstr ""
 
-#: src/lang.cls.php:185
+#: src/lang.cls.php:186
 msgid "Lazy Load URI Excludes"
 msgstr ""
 
-#: src/lang.cls.php:186
+#: src/lang.cls.php:187
 msgid "LQIP Excludes"
 msgstr ""
 
-#: src/lang.cls.php:187
+#: src/lang.cls.php:188
 msgid "Basic Image Placeholder"
 msgstr ""
 
-#: src/lang.cls.php:188
+#: src/lang.cls.php:189
 msgid "Responsive Placeholder"
 msgstr ""
 
-#: src/lang.cls.php:189
+#: src/lang.cls.php:190
 msgid "Responsive Placeholder Color"
 msgstr ""
 
-#: src/lang.cls.php:190
+#: src/lang.cls.php:191
 msgid "Responsive Placeholder SVG"
 msgstr ""
 
-#: src/lang.cls.php:191
+#: src/lang.cls.php:192
 msgid "LQIP Cloud Generator"
 msgstr ""
 
-#: src/lang.cls.php:192
+#: src/lang.cls.php:193
 msgid "LQIP Quality"
 msgstr ""
 
-#: src/lang.cls.php:193
+#: src/lang.cls.php:194
 msgid "LQIP Minimum Dimensions"
 msgstr ""
 
-#: src/lang.cls.php:195
+#: src/lang.cls.php:196
 msgid "Generate LQIP In Background"
 msgstr ""
 
-#: src/lang.cls.php:196
+#: src/lang.cls.php:197
 msgid "Lazy Load Iframes"
 msgstr ""
 
-#: src/lang.cls.php:197
+#: src/lang.cls.php:198
 msgid "Add Missing Sizes"
 msgstr ""
 
-#: src/lang.cls.php:198 src/metabox.cls.php:31 src/metabox.cls.php:32
+#: src/lang.cls.php:199 src/metabox.cls.php:31 src/metabox.cls.php:32
 #: tpl/page_optm/settings_vpi.tpl.php:12
 msgid "Viewport Images"
 msgstr ""
 
-#: src/lang.cls.php:199
+#: src/lang.cls.php:200
 msgid "Viewport Images Cron"
 msgstr ""
 
-#: src/lang.cls.php:201
+#: src/lang.cls.php:202
 msgid "Auto Request Cron"
 msgstr ""
 
-#: src/lang.cls.php:202
+#: src/lang.cls.php:203
 msgid "Auto Pull Cron"
 msgstr ""
 
-#: src/lang.cls.php:203
+#: src/lang.cls.php:204
 msgid "Optimize Original Images"
 msgstr ""
 
-#: src/lang.cls.php:204
+#: src/lang.cls.php:205
 msgid "Remove Original Backups"
 msgstr ""
 
-#: src/lang.cls.php:205
+#: src/lang.cls.php:206
 msgid "Image WebP Replacement"
 msgstr ""
 
-#: src/lang.cls.php:206
+#: src/lang.cls.php:207
 msgid "Optimize Losslessly"
 msgstr ""
 
-#: src/lang.cls.php:207
+#: src/lang.cls.php:208
 msgid "Preserve EXIF/XMP data"
 msgstr ""
 
-#: src/lang.cls.php:208
+#: src/lang.cls.php:209
 msgid "WebP Attribute To Replace"
 msgstr ""
 
-#: src/lang.cls.php:209
+#: src/lang.cls.php:210
 msgid "WebP For Extra srcset"
 msgstr ""
 
-#: src/lang.cls.php:210
+#: src/lang.cls.php:211
 msgid "WordPress Image Quality Control"
 msgstr ""
 
-#: src/lang.cls.php:211 tpl/esi_widget_edit.php:36
+#: src/lang.cls.php:212 tpl/esi_widget_edit.php:36
 msgid "Enable ESI"
 msgstr ""
 
-#: src/lang.cls.php:212
+#: src/lang.cls.php:213
 msgid "Cache Admin Bar"
 msgstr ""
 
-#: src/lang.cls.php:213
+#: src/lang.cls.php:214
 msgid "Cache Comment Form"
 msgstr ""
 
-#: src/lang.cls.php:214
+#: src/lang.cls.php:215
 msgid "ESI Nonces"
 msgstr ""
 
-#: src/lang.cls.php:215 tpl/page_optm/settings_css.tpl.php:121
+#: src/lang.cls.php:216 tpl/page_optm/settings_css.tpl.php:121
 #: tpl/page_optm/settings_css.tpl.php:238 tpl/page_optm/settings_vpi.tpl.php:67
 msgid "Vary Group"
 msgstr ""
 
-#: src/lang.cls.php:216
+#: src/lang.cls.php:217
 msgid "Purge All Hooks"
 msgstr ""
 
-#: src/lang.cls.php:217
+#: src/lang.cls.php:218
 msgid "Improve HTTP/HTTPS Compatibility"
 msgstr ""
 
-#: src/lang.cls.php:218
+#: src/lang.cls.php:219
 msgid "Instant Click"
 msgstr ""
 
-#: src/lang.cls.php:219
+#: src/lang.cls.php:220
 msgid "Do Not Cache Cookies"
 msgstr ""
 
-#: src/lang.cls.php:220
+#: src/lang.cls.php:221
 msgid "Do Not Cache User Agents"
 msgstr ""
 
-#: src/lang.cls.php:221
+#: src/lang.cls.php:222
 msgid "Login Cookie"
 msgstr ""
 
-#: src/lang.cls.php:223
+#: src/lang.cls.php:224
 msgid "Frontend Heartbeat Control"
 msgstr ""
 
-#: src/lang.cls.php:224
+#: src/lang.cls.php:225
 msgid "Frontend Heartbeat TTL"
 msgstr ""
 
-#: src/lang.cls.php:225
+#: src/lang.cls.php:226
 msgid "Backend Heartbeat Control"
 msgstr ""
 
-#: src/lang.cls.php:226
+#: src/lang.cls.php:227
 msgid "Backend Heartbeat TTL"
 msgstr ""
 
-#: src/lang.cls.php:227
+#: src/lang.cls.php:228
 msgid "Editor Heartbeat"
 msgstr ""
 
-#: src/lang.cls.php:228
+#: src/lang.cls.php:229
 msgid "Editor Heartbeat TTL"
 msgstr ""
 
-#: src/lang.cls.php:230
+#: src/lang.cls.php:231
 msgid "QUIC.cloud CDN"
 msgstr ""
 
-#: src/lang.cls.php:231
+#: src/lang.cls.php:232
 msgid "Use CDN Mapping"
 msgstr ""
 
-#: src/lang.cls.php:232
+#: src/lang.cls.php:233
 msgid "CDN URL"
 msgstr ""
 
-#: src/lang.cls.php:233
+#: src/lang.cls.php:234
 msgid "Include Images"
 msgstr ""
 
-#: src/lang.cls.php:234
+#: src/lang.cls.php:235
 msgid "Include CSS"
 msgstr ""
 
-#: src/lang.cls.php:235
+#: src/lang.cls.php:236
 msgid "Include JS"
 msgstr ""
 
-#: src/lang.cls.php:236 tpl/cdn/settings.tpl.php:102
+#: src/lang.cls.php:237 tpl/cdn/settings.tpl.php:102
 msgid "Include File Types"
 msgstr ""
 
-#: src/lang.cls.php:237
+#: src/lang.cls.php:238
 msgid "HTML Attribute To Replace"
 msgstr ""
 
-#: src/lang.cls.php:238
+#: src/lang.cls.php:239
 msgid "Original URLs"
 msgstr ""
 
-#: src/lang.cls.php:239
+#: src/lang.cls.php:240
 msgid "Included Directories"
 msgstr ""
 
-#: src/lang.cls.php:240
+#: src/lang.cls.php:241
 msgid "Exclude Path"
 msgstr ""
 
-#: src/lang.cls.php:241
+#: src/lang.cls.php:242
 msgid "Cloudflare API"
 msgstr ""
 
-#: src/lang.cls.php:244
+#: src/lang.cls.php:245
 msgid "Delay"
 msgstr ""
 
-#: src/lang.cls.php:245
+#: src/lang.cls.php:246
 msgid "Run Duration"
 msgstr ""
 
-#: src/lang.cls.php:246
+#: src/lang.cls.php:247
 msgid "Interval Between Runs"
 msgstr ""
 
-#: src/lang.cls.php:247
+#: src/lang.cls.php:248
 msgid "Crawl Interval"
 msgstr ""
 
-#: src/lang.cls.php:248
+#: src/lang.cls.php:249
 msgid "Threads"
 msgstr ""
 
-#: src/lang.cls.php:249
+#: src/lang.cls.php:250
 msgid "Timeout"
 msgstr ""
 
-#: src/lang.cls.php:250
+#: src/lang.cls.php:251
 msgid "Server Load Limit"
 msgstr ""
 
-#: src/lang.cls.php:251
+#: src/lang.cls.php:252
 msgid "Role Simulation"
 msgstr ""
 
-#: src/lang.cls.php:252
+#: src/lang.cls.php:253
 msgid "Cookie Simulation"
 msgstr ""
 
-#: src/lang.cls.php:253
+#: src/lang.cls.php:254
 msgid "Custom Sitemap"
 msgstr ""
 
-#: src/lang.cls.php:254
+#: src/lang.cls.php:255
 msgid "Drop Domain from Sitemap"
 msgstr ""
 
-#: src/lang.cls.php:255
+#: src/lang.cls.php:256
 msgid "Sitemap Timeout"
 msgstr ""
 
-#: src/lang.cls.php:257 tpl/inc/disabled_all.php:5
+#: src/lang.cls.php:258 tpl/inc/disabled_all.php:5
 msgid "Disable All Features"
 msgstr ""
 
-#: src/lang.cls.php:258 tpl/toolbox/log_viewer.tpl.php:11
+#: src/lang.cls.php:259 tpl/toolbox/log_viewer.tpl.php:11
 msgid "Debug Log"
 msgstr ""
 
-#: src/lang.cls.php:259
+#: src/lang.cls.php:260
 msgid "Admin IPs"
 msgstr ""
 
-#: src/lang.cls.php:260
+#: src/lang.cls.php:261
 msgid "Debug Level"
 msgstr ""
 
-#: src/lang.cls.php:261
+#: src/lang.cls.php:262
 msgid "Log File Size Limit"
 msgstr ""
 
-#: src/lang.cls.php:262
+#: src/lang.cls.php:263
 msgid "Log Cookies"
 msgstr ""
 
-#: src/lang.cls.php:263
+#: src/lang.cls.php:264
 msgid "Collapse Query Strings"
 msgstr ""
 
-#: src/lang.cls.php:264
+#: src/lang.cls.php:265
 msgid "Debug URI Includes"
 msgstr ""
 
-#: src/lang.cls.php:265
+#: src/lang.cls.php:266
 msgid "Debug URI Excludes"
 msgstr ""
 
-#: src/lang.cls.php:266
+#: src/lang.cls.php:267
 msgid "Debug String Excludes"
 msgstr ""
 
-#: src/lang.cls.php:268
+#: src/lang.cls.php:269
 msgid "Revisions Max Number"
 msgstr ""
 
-#: src/lang.cls.php:269
+#: src/lang.cls.php:270
 msgid "Revisions Max Age"
 msgstr ""
@@ -1988 +1992 @@
 msgstr ""
 
-#: thirdparty/litespeed-check.cls.php:111
+#: thirdparty/litespeed-check.cls.php:74 thirdparty/litespeed-check.cls.php:136
 msgid ""
 "Please consider disabling the following detected plugins, as they may "
@@ -1994 +1998 @@
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:16
+#: thirdparty/woocommerce.content.tpl.php:17
 msgid "WooCommerce Settings"
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:21
+#: thirdparty/woocommerce.content.tpl.php:22
 #: tpl/cache/settings-advanced.tpl.php:12
 #: tpl/cache/settings_inc.browser.tpl.php:12 tpl/toolbox/heartbeat.tpl.php:14
@@ -2005 +2009 @@
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:22
+#: thirdparty/woocommerce.content.tpl.php:23
 msgid "After verifying that the cache works in general, please test the cart."
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:23
+#: thirdparty/woocommerce.content.tpl.php:24
 msgid "To test the cart, visit the <a %s>FAQ</a>."
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:24
+#: thirdparty/woocommerce.content.tpl.php:25
 msgid ""
 "By default, the My Account, Checkout, and Cart pages are automatically "
@@ -2020 +2024 @@
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:31
+#: thirdparty/woocommerce.content.tpl.php:33
 msgid "Product Update Interval"
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:36
+#: thirdparty/woocommerce.content.tpl.php:38
 msgid "Purge product on changes to the quantity or stock status."
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:36
+#: thirdparty/woocommerce.content.tpl.php:38
 msgid "Purge categories only when stock status changes."
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:37
+#: thirdparty/woocommerce.content.tpl.php:39
 msgid "Purge product and categories only when the stock status changes."
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:38
+#: thirdparty/woocommerce.content.tpl.php:40
 msgid "Purge product only when the stock status changes."
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:38
+#: thirdparty/woocommerce.content.tpl.php:40
 msgid "Do not purge categories on changes to the quantity or stock status."
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:39
+#: thirdparty/woocommerce.content.tpl.php:41
 msgid ""
 "Always purge both product and categories on changes to the quantity or stock "
@@ -2050 +2054 @@
 msgstr ""
 
-#: thirdparty/woocommerce.content.tpl.php:52
+#: thirdparty/woocommerce.content.tpl.php:54
 msgid ""
 "Determines how changes in product quantity and product stock status affect "
@@ -2056 +2060 @@
 msgstr ""
 
+#: thirdparty/woocommerce.content.tpl.php:62
+msgid "Vary for Mini Cart"
+msgstr ""
+
+#: thirdparty/woocommerce.content.tpl.php:69
+msgid ""
+"Generate a separate vary cache copy for the mini cart when the cart is not "
+"empty."
+msgstr ""
+
+#: thirdparty/woocommerce.content.tpl.php:70
+msgid ""
+"If your theme does not use JS to update the mini cart, you must enable this "
+"option to display the correct cart contents."
+msgstr ""
+
 #: thirdparty/woocommerce.tab.tpl.php:3
 msgid "WooCommerce"
@@ -2084 +2104 @@
 msgstr ""
 
-#. #-#-#-#-#  litespeed-cache.pot (LiteSpeed Cache 5.6)  #-#-#-#-#
+#. #-#-#-#-#  litespeed-cache.pot (LiteSpeed Cache 5.7)  #-#-#-#-#
 #. Plugin Name of the plugin/theme
 #: tpl/banner/new_version.php:57 tpl/banner/new_version_dev.tpl.php:12
@@ -4853 +4873 @@
 msgstr ""
 
-#: tpl/page_optm/entry.tpl.php:8 tpl/page_optm/settings_html.tpl.php:7
+#: tpl/page_optm/entry.tpl.php:8 tpl/page_optm/settings_html.tpl.php:9
 msgid "HTML Settings"
 msgstr ""
@@ -4954 +4974 @@
 
 #: tpl/page_optm/settings_css.tpl.php:185
-#: tpl/page_optm/settings_html.tpl.php:129 tpl/page_optm/settings_js.tpl.php:73
+#: tpl/page_optm/settings_html.tpl.php:150 tpl/page_optm/settings_js.tpl.php:73
 msgid ""
 "This can improve your speed score in services like Pingdom, GTmetrix and "
@@ -5014 +5034 @@
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:20
+#: tpl/page_optm/settings_html.tpl.php:23
 msgid "Minify HTML content."
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:33
+#: tpl/page_optm/settings_html.tpl.php:36
 msgid "Prefetching DNS can reduce latency for visitors."
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:34
+#: tpl/page_optm/settings_html.tpl.php:37
+#: tpl/page_optm/settings_html.tpl.php:68
 msgid "For example"
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:49
+#: tpl/page_optm/settings_html.tpl.php:52
 msgid ""
 "Automatically enable DNS prefetching for all URLs in the document, including "
@@ -5032 +5053 @@
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:50
+#: tpl/page_optm/settings_html.tpl.php:53
 msgid "This can improve the page loading speed."
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:64
+#: tpl/page_optm/settings_html.tpl.php:67
+msgid "Preconnecting speeds up future loads from a given origin."
+msgstr ""
+
+#: tpl/page_optm/settings_html.tpl.php:83
 msgid "Delay rendering off-screen HTML elements by its selector."
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:79
+#: tpl/page_optm/settings_html.tpl.php:98
 msgid "Remove query strings from internal static resources."
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:82
+#: tpl/page_optm/settings_html.tpl.php:102
 msgid "Google reCAPTCHA will be bypassed automatically."
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:86
+#: tpl/page_optm/settings_html.tpl.php:107
 msgid "Append query string %s to the resources to bypass this action."
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:100
+#: tpl/page_optm/settings_html.tpl.php:121
 msgid ""
 "Use Web Font Loader library to load Google Fonts asynchronously while "
@@ -5058 +5083 @@
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:101
+#: tpl/page_optm/settings_html.tpl.php:122
 msgid ""
 "This will also add a preconnect to Google Fonts to establish a connection "
@@ -5064 +5089 @@
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:115
+#: tpl/page_optm/settings_html.tpl.php:136
 msgid "Prevent Google Fonts from loading on all pages."
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:128
+#: tpl/page_optm/settings_html.tpl.php:149
 msgid ""
 "Stop loading WordPress.org emoji. Browser default emoji will be displayed "
@@ -5074 +5099 @@
 msgstr ""
 
-#: tpl/page_optm/settings_html.tpl.php:142
+#: tpl/page_optm/settings_html.tpl.php:163
 msgid "This option will remove all %s tags from HTML."
 msgstr ""

litespeed-cache/trunk/lib/guest.cls.php

@@ -1 +1 @@
 <?php
+
 namespace LiteSpeed\Lib;
 
@@ -7 +8 @@
  * @since 4.1
  */
-class Guest {
+class Guest
+{
     const CONF_FILE = '.litespeed_conf.dat';
     const HASH                  = 'hash'; // Not set-able
@@ -26 +28 @@
      * @since 4.1
      */
-    public function __construct() {
-        ! defined( 'LSCWP_CONTENT_FOLDER' ) && define( 'LSCWP_CONTENT_FOLDER', dirname( dirname( dirname( __DIR__ ) ) ) );
+    public function __construct()
+    {
+        !defined('LSCWP_CONTENT_FOLDER') && define('LSCWP_CONTENT_FOLDER', dirname(dirname(dirname(__DIR__))));
         // Load config
-        $this->_conf = file_get_contents( LSCWP_CONTENT_FOLDER . '/' . self::CONF_FILE );
-        if ( $this->_conf ) {
-            $this->_conf = json_decode( $this->_conf, true );
+        $this->_conf = file_get_contents(LSCWP_CONTENT_FOLDER . '/' . self::CONF_FILE);
+        if ($this->_conf) {
+            $this->_conf = json_decode($this->_conf, true);
         }
 
-        if ( ! empty( $this->_conf[ self::O_CACHE_LOGIN_COOKIE ] ) ) {
-            self::$_vary_name = $this->_conf[ self::O_CACHE_LOGIN_COOKIE ];
+        if (!empty($this->_conf[self::O_CACHE_LOGIN_COOKIE])) {
+            self::$_vary_name = $this->_conf[self::O_CACHE_LOGIN_COOKIE];
         }
     }
@@ -44 +47 @@
      * @since  4.0
      */
-    public function update_guest_vary() {
+    public function update_guest_vary()
+    {
         // This process must not be cached
-        header( 'X-LiteSpeed-Cache-Control: no-cache' );
+        /**
+         * @reference https://wordpress.org/support/topic/soft-404-from-google-search-on-litespeed-cache-guest-vary-php/#post-16838583
+         */
+        header('X-Robots-Tag: noindex');
+        header('X-LiteSpeed-Cache-Control: no-cache');
 
-        if ( $this->always_guest() ) {
+        if ($this->always_guest()) {
             echo '[]';
             exit;
@@ -54 +62 @@
 
         // If contains vary already, don't reload to avoid infinite loop when parent page having browser cache
-        if ( $this->_conf && self::has_vary() ) {
+        if ($this->_conf && self::has_vary()) {
             echo '[]';
             exit;
@@ -61 +69 @@
         // Send vary cookie
         $vary = 'guest_mode:1';
-        if ( $this->_conf && empty( $this->_conf[ self::O_DEBUG ] ) ) {
-            $vary = md5( $this->_conf[ self::HASH ] . $vary );
+        if ($this->_conf && empty($this->_conf[self::O_DEBUG])) {
+            $vary = md5($this->_conf[self::HASH] . $vary);
         }
 
         $expire = time() + 2 * 86400;
-        $is_ssl = ! empty( $this->_conf[ self::O_UTIL_NO_HTTPS_VARY ] ) ? false : $this->is_ssl();
-        setcookie( self::$_vary_name, $vary, $expire, '/', false, $is_ssl, true );
+        $is_ssl = !empty($this->_conf[self::O_UTIL_NO_HTTPS_VARY]) ? false : $this->is_ssl();
+        setcookie(self::$_vary_name, $vary, $expire, '/', false, $is_ssl, true);
 
         // return json
-        echo json_encode( array( 'reload' => 'yes' ) );
+        echo json_encode(array('reload' => 'yes'));
         exit;
     }
@@ -79 +87 @@
      * @since 4.1
      */
-    private function is_ssl() {
-        if ( isset( $_SERVER['HTTPS'] ) ) {
-            if ( 'on' === strtolower( $_SERVER['HTTPS'] ) ) {
+    private function is_ssl()
+    {
+        if (isset($_SERVER['HTTPS'])) {
+            if ('on' === strtolower($_SERVER['HTTPS'])) {
                 return true;
             }
 
-            if ( '1' == $_SERVER['HTTPS'] ) {
+            if ('1' == $_SERVER['HTTPS']) {
                 return true;
             }
-        } elseif ( isset( $_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+        } elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
             return true;
         }
@@ -100 +109 @@
      * @access public
      */
-    public static function has_vary() {
-        if ( empty( $_COOKIE[ self::$_vary_name ] ) ) {
+    public static function has_vary()
+    {
+        if (empty($_COOKIE[self::$_vary_name])) {
             return false;
         }
-        return $_COOKIE[ self::$_vary_name ];
+        return $_COOKIE[self::$_vary_name];
     }
 
@@ -112 +122 @@
      * @since  4.0
      */
-    public function always_guest() {
-        if ( empty( $_SERVER[ 'HTTP_USER_AGENT' ] ) ) {
+    public function always_guest()
+    {
+        if (empty($_SERVER['HTTP_USER_AGENT'])) {
             return false;
         }
 
-        if ( $this->_conf[ self::O_GUEST_UAS ] ) {
+        if ($this->_conf[self::O_GUEST_UAS]) {
             $quoted_uas = array();
-            foreach ( $this->_conf[ self::O_GUEST_UAS ] as $v ) {
-                $quoted_uas[] = preg_quote( $v, '#' );
+            foreach ($this->_conf[self::O_GUEST_UAS] as $v) {
+                $quoted_uas[] = preg_quote($v, '#');
             }
-            $match = preg_match( '#' . implode( '|', $quoted_uas ) . '#i', $_SERVER[ 'HTTP_USER_AGENT' ] );
-            if ( $match ) {
+            $match = preg_match('#' . implode('|', $quoted_uas) . '#i', $_SERVER['HTTP_USER_AGENT']);
+            if ($match) {
                 return true;
             }
         }
 
-        if ( $this->ip_access( $this->_conf[ self::O_GUEST_IPS ] ) ) {
+        if ($this->ip_access($this->_conf[self::O_GUEST_IPS])) {
             return true;
         }
@@ -141 +152 @@
      * @access public
      */
-    public function ip_access( $ip_list ) {
-        if ( ! $ip_list ) {
+    public function ip_access($ip_list)
+    {
+        if (!$ip_list) {
             return false;
         }
-        if ( ! isset( self::$_ip ) ) {
+        if (!isset(self::$_ip)) {
             self::$_ip = self::get_ip();
         }
@@ -155 +167 @@
         //  for($i = 0; $i <= 3; $i++) if($ip[$i] == '*') $ip_list[$key][$i] = $uip[$i];
         // }
-        return in_array( self::$_ip, $ip_list );
+        return in_array(self::$_ip, $ip_list);
     }
 
@@ -166 +178 @@
      * @return string
      */
-    public static function get_ip() {
+    public static function get_ip()
+    {
         $_ip = '';
-        if ( function_exists( 'apache_request_headers' ) ) {
+        if (function_exists('apache_request_headers')) {
             $apache_headers = apache_request_headers();
-            $_ip = ! empty( $apache_headers['True-Client-IP'] ) ? $apache_headers['True-Client-IP'] : false;
-            if ( ! $_ip ) {
-                $_ip = ! empty( $apache_headers['X-Forwarded-For'] ) ? $apache_headers['X-Forwarded-For'] : false;
-                $_ip = explode( ',', $_ip );
-                $_ip = $_ip[ 0 ];
+            $_ip = !empty($apache_headers['True-Client-IP']) ? $apache_headers['True-Client-IP'] : false;
+            if (!$_ip) {
+                $_ip = !empty($apache_headers['X-Forwarded-For']) ? $apache_headers['X-Forwarded-For'] : false;
+                $_ip = explode(',', $_ip);
+                $_ip = $_ip[0];
             }
-
         }
 
-        if ( ! $_ip ) {
-            $_ip = ! empty( $_SERVER['REMOTE_ADDR'] ) ? $_SERVER['REMOTE_ADDR'] : false;
+        if (!$_ip) {
+            $_ip = !empty($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : false;
         }
         return $_ip;
     }
-
-
 }

litespeed-cache/trunk/litespeed-cache.php

@@ -5 +5 @@
  * Plugin URI:        https://www.litespeedtech.com/products/cache-plugins/wordpress-acceleration
  * Description:       High-performance page caching and site optimization from LiteSpeed
- * Version:           5.6
+ * Version:           5.7
  * Author:            LiteSpeed Technologies
  * Author URI:        https://www.litespeedtech.com
@@ -35 +35 @@
 }
 
-!defined('LSCWP_V') && define('LSCWP_V', '5.6');
+!defined('LSCWP_V') && define('LSCWP_V', '5.7');
 
 !defined('LSCWP_CONTENT_DIR') && define('LSCWP_CONTENT_DIR', WP_CONTENT_DIR);

litespeed-cache/trunk/readme.txt

@@ -3 +3 @@
 Tags: caching, optimize, performance, pagespeed, core web vitals, seo, speed, image optimize, compress, object cache, redis, memcached, database cleaner
 Requires at least: 4.0
-Tested up to: 6.3
-Stable tag: 5.6
+Tested up to: 6.3.1
+Stable tag: 5.7
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl.html
@@ -251 +251 @@
 == Changelog ==
 
-= 5.6 - Aug 15 2023 =
+= 5.7 - Oct 10 2023 =
+* 🌱**Page Optimize** New option available: Preconnect. (xguiboy/Mukesh Patel)
+* 🌱**3rd** New Vary for Mini Cart option for Woocommerce. (Ruikai)
+* **Cloud** Force syncing the configuration to QUIC.cloud if CDN is reenabled.
+* **Cloud** Force syncing the configuration to QUIC.cloud if domain key is readded.
+* **Cloud** Limit multi-line fields when posting to QC.
+* **Cache** Treat HEAD requests as cacheable as GET. (George Wang)
+* 🐞**ESI** Patched a possible vulnerability issue. (István Márton@Wordfence #841011)
+* 🐞**ESI** Overwrite SCRIPT_URI to prevent ESI sub request resulting in redirections. (Tobolo)
+* 🐞**Image Optimize** Bypass unnecessary image processing when images were only partially optimized. (Ruikai)
+* 🐞**Guest** Guest mode will not enable WebP directly anymore. (Michael Heymann)
+* **CDN** Auto disable CDN if CDN URL is invalid. (Ruikai)
+* **CDN** Fixed a null parameter warning for PHP v8.1 (#584)
+* **API** Added `litespeed_media_add_missing_sizes` filter to allow bypassing Media's "add missing sizes" option (for Guest Optimization and otherwise). (PR #564)
+* **Guest** Fixed soft 404 and robots.txt report for guest.vary.php.
+* **Vary** Enabled `litespeed_vary_cookies` for LSWS Enterprise.
+* **GUI** Stopped WebP tip from wrongly displaying when Guest Mode is off.
+* **GUI** Added QUIC.cloud promotion postbox on dashboard page.
+* **3rd** Added `pagespeed ninja` to blocklist due to its bad bahavior.
+
+= 5.6 - Aug 1 2023 =
 * 🌱**Page Optimize** New JS Delay Includes option. (Mitchell Krog/Gerard Reches/Ignacy Hołoga)
 * **Crawler** Sitemap can use search for URL now.

litespeed-cache/trunk/src/admin-settings.cls.php

@@ -1 +1 @@
 <?php
+
 /**
  * The admin settings handler of the plugin.
@@ -9 +10 @@
  * @author     LiteSpeed Technologies <[email protected]>
  */
+
 namespace LiteSpeed;
-defined( 'WPINC' ) || exit;
-
-class Admin_Settings extends Base {
+
+defined('WPINC') || exit;
+
+class Admin_Settings extends Base
+{
     const ENROLL = '_settings-enroll';
 
@@ -25 +29 @@
      * @access public
      */
-    public function save( $raw_data ) {
-        Debug2::debug( '[Settings] saving' );
-
-        if ( empty( $raw_data[ self::ENROLL ] ) ) {
-            exit( 'No fields' );
-        }
-
-        $raw_data = Admin::cleanup_text( $raw_data );
+    public function save($raw_data)
+    {
+        Debug2::debug('[Settings] saving');
+
+        if (empty($raw_data[self::ENROLL])) {
+            exit('No fields');
+        }
+
+        $raw_data = Admin::cleanup_text($raw_data);
 
         // Convert data to config format
         $the_matrix = array();
-        foreach ( array_unique( $raw_data[ self::ENROLL ] ) as $id ) {
+        foreach (array_unique($raw_data[self::ENROLL]) as $id) {
             $child = false;
             // Drop array format
-            if ( strpos( $id, '[' ) !== false ) {
-                if ( strpos( $id, self::O_CDN_MAPPING ) === 0 || strpos( $id, self::O_CRAWLER_COOKIES ) === 0 ) { // CDN child | Cookie Crawler settings
-                    $child = substr( $id, strpos( $id, '[' ) + 1, strpos( $id, ']' ) - strpos( $id, '[' ) - 1 );
-                    $id = substr( $id, 0, strpos( $id, '[' ) ); // Drop ending []; Compatible with xx[0] way from CLI
-                }
-                else {
-                    $id = substr( $id, 0, strpos( $id, '[' ) ); // Drop ending []
-                }
-            }
-
-            if ( ! array_key_exists( $id, self::$_default_options ) ) {
+            if (strpos($id, '[') !== false) {
+                if (strpos($id, self::O_CDN_MAPPING) === 0 || strpos($id, self::O_CRAWLER_COOKIES) === 0) { // CDN child | Cookie Crawler settings
+                    $child = substr($id, strpos($id, '[') + 1, strpos($id, ']') - strpos($id, '[') - 1);
+                    $id = substr($id, 0, strpos($id, '[')); // Drop ending []; Compatible with xx[0] way from CLI
+                } else {
+                    $id = substr($id, 0, strpos($id, '[')); // Drop ending []
+                }
+            }
+
+            if (!array_key_exists($id, self::$_default_options)) {
                 continue;
             }
 
             // Validate $child
-            if ( $id == self::O_CDN_MAPPING ) {
-                if ( ! in_array( $child, array(
+            if ($id == self::O_CDN_MAPPING) {
+                if (!in_array($child, array(
                     self::CDN_MAPPING_URL,
                     self::CDN_MAPPING_INC_IMG,
@@ -61 +65 @@
                     self::CDN_MAPPING_INC_JS,
                     self::CDN_MAPPING_FILETYPE,
-                ) ) ) {
+                ))) {
                     continue;
                 }
             }
-            if ( $id == self::O_CRAWLER_COOKIES ) {
-                if ( ! in_array( $child, array(
+            if ($id == self::O_CRAWLER_COOKIES) {
+                if (!in_array($child, array(
                     self::CRWL_COOKIE_NAME,
                     self::CRWL_COOKIE_VALS,
-                ) ) ) {
+                ))) {
                     continue;
                 }
@@ -76 +80 @@
             $data = false;
 
-            if ( $child ) {
-                $data = ! empty( $raw_data[ $id ][ $child ] ) ? $raw_data[ $id ][ $child ] : false; // []=xxx or [0]=xxx
-            }
-            else {
-                $data = ! empty( $raw_data[ $id ] ) ? $raw_data[ $id ] : false;
+            if ($child) {
+                $data = !empty($raw_data[$id][$child]) ? $raw_data[$id][$child] : false; // []=xxx or [0]=xxx
+            } else {
+                $data = !empty($raw_data[$id]) ? $raw_data[$id] : false;
             }
 
@@ -86 +89 @@
              * Sanitize the value
              */
-            if ( $id == self::O_CDN_MAPPING || $id == self::O_CRAWLER_COOKIES ) {
+            if ($id == self::O_CDN_MAPPING || $id == self::O_CRAWLER_COOKIES) {
                 // Use existing in queue data if existed (Only available when $child != false)
-                $data2 = array_key_exists( $id, $the_matrix ) ? $the_matrix[ $id ] : ( defined( 'WP_CLI' ) && WP_CLI ? $this->conf( $id ) : array() );
-            }
-            switch ( $id ) {
+                $data2 = array_key_exists($id, $the_matrix) ? $the_matrix[$id] : (defined('WP_CLI') && WP_CLI ? $this->conf($id) : array());
+            }
+            switch ($id) {
                 case self::O_CDN_MAPPING:
                     /**
@@ -104 +107 @@
                      *      cdn-mapping[ 2 ][ url ] = 'xxx2'
                      */
-                    if ( $data ) foreach ( $data as $k => $v ) {
-                        if ( $child == self::CDN_MAPPING_FILETYPE ) {
-                            $v = Utility::sanitize_lines( $v );
-                        }
-                        if ( $child == self::CDN_MAPPING_URL ) {
-                            $v = trailingslashit( $v );
-                        }
-                        if ( in_array( $child, array(
+                    if ($data) foreach ($data as $k => $v) {
+                        if ($child == self::CDN_MAPPING_FILETYPE) {
+                            $v = Utility::sanitize_lines($v);
+                        }
+                        if ($child == self::CDN_MAPPING_URL) {
+                            # If not a valid URL, turn off CDN
+                            if (strpos($v, 'https://') !== 0) {
+                                self::debug('❌ CDN mapping set to OFF due to invalid URL');
+                                $the_matrix[self::O_CDN] = false;
+                            }
+                            $v = trailingslashit($v);
+                        }
+                        if (in_array($child, array(
                             self::CDN_MAPPING_INC_IMG,
                             self::CDN_MAPPING_INC_CSS,
                             self::CDN_MAPPING_INC_JS,
-                        ) ) ) {
+                        ))) {
                             // Because these can't be auto detected in `config->update()`, need to format here
                             $v = $v === 'false' ? 0 : (bool) $v;
                         }
 
-                        if ( empty( $data2[ $k ] ) ) {
-                            $data2[ $k ] = array();
-                        }
-
-                        $data2[ $k ][ $child ] = $v;
+                        if (empty($data2[$k])) {
+                            $data2[$k] = array();
+                        }
+
+                        $data2[$k][$child] = $v;
                     }
 
@@ -147 +155 @@
                      * empty line for `vals` use literal `_null`
                      */
-                    if ( $data ) foreach ( $data as $k => $v ) {
-                        if ( $child == self::CRWL_COOKIE_VALS ) {
-                            $v = Utility::sanitize_lines( $v );
-                        }
-
-                        if ( empty( $data2[ $k ] ) ) {
-                            $data2[ $k ] = array();
-                        }
-
-                        $data2[ $k ][ $child ] = $v;
+                    if ($data) foreach ($data as $k => $v) {
+                        if ($child == self::CRWL_COOKIE_VALS) {
+                            $v = Utility::sanitize_lines($v);
+                        }
+
+                        if (empty($data2[$k])) {
+                            $data2[$k] = array();
+                        }
+
+                        $data2[$k][$child] = $v;
                     }
 
@@ -162 +170 @@
                     break;
 
-                // Cache exclude cat
+                    // Cache exclude cat
                 case self::O_CACHE_EXC_CAT:
                     $data2 = array();
-                    $data = Utility::sanitize_lines( $data );
-                    foreach ( $data as $v ) {
-                        $cat_id = get_cat_ID( $v );
-                        if ( ! $cat_id ) {
+                    $data = Utility::sanitize_lines($data);
+                    foreach ($data as $v) {
+                        $cat_id = get_cat_ID($v);
+                        if (!$cat_id) {
                             continue;
                         }
@@ -177 +185 @@
                     break;
 
-                // Cache exclude tag
-                case self::O_CACHE_EXC_TAG :
+                    // Cache exclude tag
+                case self::O_CACHE_EXC_TAG:
                     $data2 = array();
-                    $data = Utility::sanitize_lines( $data );
-                    foreach ( $data as $v ) {
-                        $term = get_term_by( 'name', $v, 'post_tag' );
-                        if ( ! $term ) {
+                    $data = Utility::sanitize_lines($data);
+                    foreach ($data as $v) {
+                        $term = get_term_by('name', $v, 'post_tag');
+                        if (!$term) {
                             // todo: can show the error in admin error msg
                             continue;
@@ -197 +205 @@
             }
 
-            $the_matrix[ $id ] = $data;
+            $the_matrix[$id] = $data;
         }
 
         // Special handler for CDN/Crawler 2d list to drop empty rows
-        foreach ( $the_matrix as $id => $data ) {
+        foreach ($the_matrix as $id => $data) {
             /**
              *      cdn-mapping[ 0 ][ url ] = 'xxx'
@@ -210 +218 @@
              *      crawler-cookie[ 2 ][ name ] = 'xxx2'
              */
-            if ( $id == self::O_CDN_MAPPING || $id == self::O_CRAWLER_COOKIES ) {
+            if ($id == self::O_CDN_MAPPING || $id == self::O_CRAWLER_COOKIES) {
                 // Drop this line if all children elements are empty
-                foreach ( $data as $k => $v ) {
-                    foreach ( $v as $v2 ) {
-                        if ( $v2 ) {
+                foreach ($data as $k => $v) {
+                    foreach ($v as $v2) {
+                        if ($v2) {
                             continue 2;
                         }
                     }
                     // If hit here, means all empty
-                    unset( $the_matrix[ $id ][ $k ] );
+                    unset($the_matrix[$id][$k]);
                 }
             }
 
             // Don't allow repeated cookie name
-            if ( $id == self::O_CRAWLER_COOKIES ) {
+            if ($id == self::O_CRAWLER_COOKIES) {
                 $existed = array();
-                foreach ( $the_matrix[ $id ] as $k => $v ) {
-                    if ( ! $v[ self::CRWL_COOKIE_NAME ] || in_array( $v[ self::CRWL_COOKIE_NAME ], $existed ) ) { // Filter repeated or empty name
-                        unset( $the_matrix[ $id ][ $k ] );
+                foreach ($the_matrix[$id] as $k => $v) {
+                    if (!$v[self::CRWL_COOKIE_NAME] || in_array($v[self::CRWL_COOKIE_NAME], $existed)) { // Filter repeated or empty name
+                        unset($the_matrix[$id][$k]);
                         continue;
                     }
 
-                    $existed[] = $v[ self::CRWL_COOKIE_NAME ];
+                    $existed[] = $v[self::CRWL_COOKIE_NAME];
                 }
             }
@@ -238 +246 @@
             // CDN mapping allow URL values repeated
             // if ( $id == self::O_CDN_MAPPING ) {}
+
+            // tmp fix the 3rd part woo update hook issue when enabling vary cookie
+            if ($id == 'wc_cart_vary') {
+                if ($data)
+                    add_filter('litespeed_vary_cookies', function ($list) {
+                        $list[] = 'woocommerce_cart_hash';
+                        return array_unique($list);
+                    });
+                else {
+                    add_filter('litespeed_vary_cookies', function ($list) {
+                        if (in_array('woocommerce_cart_hash', $list)) {
+                            unset($list[array_search('woocommerce_cart_hash', $list)]);
+                        }
+                        return array_unique($list);
+                    });
+                }
+            }
         }
 
         // id validation will be inside
-        $this->cls( 'Conf' )->update_confs( $the_matrix );
-
-        $msg = __( 'Options saved.', 'litespeed-cache' );
-        Admin_Display::succeed( $msg );
+        $this->cls('Conf')->update_confs($the_matrix);
+
+        $msg = __('Options saved.', 'litespeed-cache');
+        Admin_Display::succeed($msg);
     }
 
@@ -253 +278 @@
      * @access public
      */
-    public function network_save( $raw_data ) {
-        Debug2::debug( '[Settings] network saving' );
-
-        if ( empty( $raw_data[ self::ENROLL ] ) ) {
-            exit( 'No fields' );
-        }
-
-        $raw_data = Admin::cleanup_text( $raw_data );
-
-        foreach ( array_unique( $raw_data[ self::ENROLL ] ) as $id ) {
+    public function network_save($raw_data)
+    {
+        Debug2::debug('[Settings] network saving');
+
+        if (empty($raw_data[self::ENROLL])) {
+            exit('No fields');
+        }
+
+        $raw_data = Admin::cleanup_text($raw_data);
+
+        foreach (array_unique($raw_data[self::ENROLL]) as $id) {
             // Append current field to setting save
-            if ( ! array_key_exists( $id, self::$_default_site_options ) ) {
+            if (!array_key_exists($id, self::$_default_site_options)) {
                 continue;
             }
 
-            $data = ! empty( $raw_data[ $id ] ) ? $raw_data[ $id ] : false;
+            $data = !empty($raw_data[$id]) ? $raw_data[$id] : false;
 
             // id validation will be inside
-            $this->cls( 'Conf' )->network_update( $id, $data );
+            $this->cls('Conf')->network_update($id, $data);
         }
 
@@ -277 +303 @@
         Activation::cls()->update_files();
 
-        $msg = __( 'Options saved.', 'litespeed-cache' );
-        Admin_Display::succeed( $msg );
+        $msg = __('Options saved.', 'litespeed-cache');
+        Admin_Display::succeed($msg);
     }
 
@@ -290 +316 @@
      * @return string the updated location string.
      */
-    public static function widget_save_err( $location ) {
-        return str_replace( '?message=0', '?error=0', $location ) ;
+    public static function widget_save_err($location)
+    {
+        return str_replace('?message=0', '?error=0', $location);
     }
 
@@ -306 +333 @@
      * @return mixed Updated settings on success, false on error.
      */
-    public static function validate_widget_save( $instance, $new_instance, $old_instance, $widget ) {
-        if ( empty( $new_instance ) ) {
+    public static function validate_widget_save($instance, $new_instance, $old_instance, $widget)
+    {
+        if (empty($new_instance)) {
             return $instance;
         }
 
-        if ( ! isset( $new_instance[ ESI::WIDGET_O_ESIENABLE ] ) || ! isset( $new_instance[ ESI::WIDGET_O_TTL ] ) ) {
+        if (!isset($new_instance[ESI::WIDGET_O_ESIENABLE]) || !isset($new_instance[ESI::WIDGET_O_TTL])) {
             return $instance;
         }
 
-        $esi = intval( $new_instance[ ESI::WIDGET_O_ESIENABLE ] ) % 3;
-        $ttl = (int) $new_instance[ ESI::WIDGET_O_TTL ];
-
-        if ( $ttl != 0 && $ttl < 30 ) {
-            add_filter( 'wp_redirect', __CLASS__ . '::widget_save_err' ) ;
-            return false ; // invalid ttl.
-        }
-
-        if ( empty( $instance[ Conf::OPTION_NAME ] ) ) {// todo: to be removed
-            $instance[ Conf::OPTION_NAME ] = array() ;
-        }
-        $instance[ Conf::OPTION_NAME ][ ESI::WIDGET_O_ESIENABLE ] = $esi ;
-        $instance[ Conf::OPTION_NAME ][ ESI::WIDGET_O_TTL ] = $ttl ;
-
-        $current = ! empty( $old_instance[ Conf::OPTION_NAME ] ) ? $old_instance[ Conf::OPTION_NAME ] : false ;
-        if ( ! strpos( $_SERVER[ 'HTTP_REFERER' ], '/wp-admin/customize.php') ) {
-            if ( ! $current || $esi != $current[ ESI::WIDGET_O_ESIENABLE ] ) {
-                Purge::purge_all( 'Wdiget ESI_enable changed' ) ;
-            }
-            elseif ( $ttl != 0 && $ttl != $current[ ESI::WIDGET_O_TTL ] ) {
-                Purge::add( Tag::TYPE_WIDGET . $widget->id ) ;
-            }
-
-            Purge::purge_all( 'Wdiget saved' ) ;
-        }
-        return $instance ;
+        $esi = intval($new_instance[ESI::WIDGET_O_ESIENABLE]) % 3;
+        $ttl = (int) $new_instance[ESI::WIDGET_O_TTL];
+
+        if ($ttl != 0 && $ttl < 30) {
+            add_filter('wp_redirect', __CLASS__ . '::widget_save_err');
+            return false; // invalid ttl.
+        }
+
+        if (empty($instance[Conf::OPTION_NAME])) { // todo: to be removed
+            $instance[Conf::OPTION_NAME] = array();
+        }
+        $instance[Conf::OPTION_NAME][ESI::WIDGET_O_ESIENABLE] = $esi;
+        $instance[Conf::OPTION_NAME][ESI::WIDGET_O_TTL] = $ttl;
+
+        $current = !empty($old_instance[Conf::OPTION_NAME]) ? $old_instance[Conf::OPTION_NAME] : false;
+        if (!strpos($_SERVER['HTTP_REFERER'], '/wp-admin/customize.php')) {
+            if (!$current || $esi != $current[ESI::WIDGET_O_ESIENABLE]) {
+                Purge::purge_all('Wdiget ESI_enable changed');
+            } elseif ($ttl != 0 && $ttl != $current[ESI::WIDGET_O_TTL]) {
+                Purge::add(Tag::TYPE_WIDGET . $widget->id);
+            }
+
+            Purge::purge_all('Wdiget saved');
+        }
+        return $instance;
     }
 }

litespeed-cache/trunk/src/base.cls.php

@@ -160 +160 @@
     const O_OPTM_DNS_PREFETCH       = 'optm-dns_prefetch';
     const O_OPTM_DNS_PREFETCH_CTRL  = 'optm-dns_prefetch_ctrl';
+    const O_OPTM_DNS_PRECONNECT     = 'optm-dns_preconnect';
     const O_OPTM_EXC                = 'optm-exc';
     const O_OPTM_GUEST_ONLY         = 'optm-guest_only';
@@ -447 +448 @@
         self::O_OPTM_DNS_PREFETCH       => array(),
         self::O_OPTM_DNS_PREFETCH_CTRL  => false,
+        self::O_OPTM_DNS_PRECONNECT     => array(),
         self::O_OPTM_EXC                => array(),
         self::O_OPTM_GUEST_ONLY         => false,

litespeed-cache/trunk/src/cdn.cls.php

@@ -248 +248 @@
             foreach ( $matches[ $v[ 0 ] ? 3 : 2 ] as $k2 => $url ) {
                 // Debug2::debug2( '[CDN] check ' . $url );
-                $postfix = '.' . pathinfo( parse_url( $url, PHP_URL_PATH ), PATHINFO_EXTENSION );
+                $postfix = '.' . pathinfo( (string) parse_url( $url, PHP_URL_PATH ), PATHINFO_EXTENSION );
                 if ( ! array_key_exists( $postfix, $this->_cfg_cdn_mapping ) ) {
                     // Debug2::debug2( '[CDN] non-existed postfix ' . $postfix );

litespeed-cache/trunk/src/cdn/quic.cls.php

@@ -1 +1 @@
 <?php
+
 /**
  * The quic.cloud class.
@@ -8 +9 @@
  * @author      LiteSpeed Technologies <[email protected]>
  */
+
 namespace LiteSpeed\CDN;
 
@@ -13 +15 @@
 use LiteSpeed\Base;
 
-defined( 'WPINC' ) || exit;
+defined('WPINC') || exit;
 
-class Quic extends Base {
+class Quic extends Base
+{
     const LOG_TAG = '☁️';
 
@@ -21 +24 @@
 
     protected $_summary;
-    public function __construct() {
+    public function __construct()
+    {
         $this->_summary = self::get_summary();
     }
@@ -30 +34 @@
      * @access public
      */
-    public static function try_sync_config() {
+    public static function try_sync_config()
+    {
         self::cls()->try_sync_conf();
     }
 
-    public function try_sync_conf() {
+    public function try_sync_conf($force = false)
+    {
         $options = $this->get_options();
 
-        if ( ! $options[ self::O_CDN_QUIC ] ) {
+        if (!$options[self::O_CDN_QUIC]) {
+            if (!empty($this->_summary['conf_md5'])) self::save_summary(array('conf_md5' => ''));
             return false;
         }
@@ -46 +53 @@
             self::O_OBJECT_PSWD,
         );
-        foreach ( $secure_fields as $v ) {
-            if ( ! empty( $options[ $v ] ) ) {
-                $options[ $v ] = str_repeat( '*', strlen( $options[ $v ] ) );
+        foreach ($secure_fields as $v) {
+            if (!empty($options[$v])) {
+                $options[$v] = str_repeat('*', strlen($options[$v]));
             }
         }
-        unset( $options[ self::O_MEDIA_LQIP_EXC ] );
+        unset($options[self::O_MEDIA_LQIP_EXC]);
+
+        // Remove overflow multi lines fields
+        foreach ($options as $k => $v) {
+            if (is_array($v) && count($v) > 30) {
+                $v = array_slice($v, 0, 30);
+                $options[$k] = $v;
+            }
+        }
 
         // Rest url
-        $options[ '_rest' ] = function_exists( 'rest_get_url_prefix' ) ? rest_get_url_prefix() : apply_filters( 'rest_url_prefix', 'wp-json' );
-        $options[ '_home_url' ] = home_url( '/' );
+        $options['_rest'] = function_exists('rest_get_url_prefix') ? rest_get_url_prefix() : apply_filters('rest_url_prefix', 'wp-json');
+        $options['_home_url'] = home_url('/');
 
         // Add server env vars
-        $options[ '_server' ] = $this->server_vars();
+        $options['_server'] = $this->server_vars();
 
         // Append hooks
-        $options[ '_tp_cookies' ] = apply_filters( 'litespeed_vary_cookies', array() );
+        $options['_tp_cookies'] = apply_filters('litespeed_vary_cookies', array());
 
-        $conf_md5 = md5( json_encode( $options ) );
-        if ( ! empty( $this->_summary[ 'conf_md5' ] ) && $conf_md5 == $this->_summary[ 'conf_md5' ] ) {
-            self::debug( 'Bypass sync conf to QC due to same md5', $conf_md5 );
-            return;
+        $conf_md5 = md5(json_encode($options));
+        if (!empty($this->_summary['conf_md5']) && $conf_md5 == $this->_summary['conf_md5']) {
+            if (!$force) {
+                self::debug('Bypass sync conf to QC due to same md5', $conf_md5);
+                return;
+            }
+            self::debug('!!!Force sync conf even same md5');
         }
 
-        self::save_summary( array( 'conf_md5' => $conf_md5 ) );
+        self::save_summary(array('conf_md5' => $conf_md5));
         self::debug('sync conf to QC', $options);
 
-        Cloud::post( Cloud::SVC_D_SYNC_CONF, $options );
+        Cloud::post(Cloud::SVC_D_SYNC_CONF, $options);
     }
-
 }

litespeed-cache/trunk/src/cloud.cls.php

@@ -576 +576 @@
         $home_url = home_url();
         if (!wp_http_validate_url($home_url)) {
+            self::debug('wp_http_validate_url failed: ' . $home_url);
             return false;
         }
@@ -589 +590 @@
         /** @since 5.0 If in valid err_domains, bypass request */
         if ($this->_is_err_domain($home_url)) {
+            self::debug('home url is in err_domains, bypass request: ' . $home_url);
             return false;
         }
@@ -1370 +1372 @@
         $this->_summary['is_linked'] = 1;
         self::save_summary();
+
+        # Force resync qc conf
+        $this->cls('CDN\Quic')->try_sync_conf(true);
     }
 

litespeed-cache/trunk/src/control.cls.php

@@ -743 +743 @@
 
         $method = isset( $_SERVER['REQUEST_METHOD'] ) ? $_SERVER['REQUEST_METHOD'] : 'unknown';
-        if ( 'GET' !== $method ) {
+        if ( 'GET' !== $method && 'HEAD' !== $method ) {
             return $this->_no_cache_for('Not GET method: ' . $method);
         }

litespeed-cache/trunk/src/crawler.cls.php

@@ -961 +961 @@
 
         // WebP on/off
-        if ($this->conf(Base::O_GUEST) || $this->conf(Base::O_IMG_OPTM_WEBP)) {
+        if (($this->conf(Base::O_GUEST) && $this->conf(Base::O_GUEST_OPTM)) || $this->conf(Base::O_IMG_OPTM_WEBP)) {
             $crawler_factors['webp'] = array(1 => 'WebP', 0 => '');
         }

litespeed-cache/trunk/src/doc.cls.php

@@ -27 +27 @@
     {
         if (apply_filters('litespeed_conf', $id)) return;
+        if (!apply_filters('litespeed_conf', Base::O_GUEST)) return;
         if (!apply_filters('litespeed_conf', Base::O_GUEST_OPTM)) return;
         echo '<font class="litespeed-warning">';
-        echo '⚠️ ' . sprintf(__('This setting is passively %1$s due to %2$s!', 'litespeed-cache'), '<code>' . __('ON', 'litespeed-cache') . '</code>', Lang::title(Base::O_GUEST_OPTM));
+        echo '⚠️ ' . sprintf(__('This setting is %1$s for certain qualifying requests due to %2$s!', 'litespeed-cache'), '<code>' . __('ON', 'litespeed-cache') . '</code>', Lang::title(Base::O_GUEST_OPTM));
+        self::learn_more('https://docs.litespeedtech.com/lscache/lscwp/general/#guest-optimization');
         echo '</font>';
     }

litespeed-cache/trunk/src/esi.cls.php

@@ -1 +1 @@
 <?php
+
 /**
  * The ESI class.
@@ -10 +11 @@
  * @author      LiteSpeed Technologies <[email protected]>
  */
+
 namespace LiteSpeed;
 
-defined( 'WPINC' ) || exit;
-
-class ESI extends Root {
+defined('WPINC') || exit;
+
+class ESI extends Root
+{
+    const LOG_TAG = '⏺';
+
     private static $has_esi = false;
     private static $_combine_ids = array();
     private $esi_args = null;
     private $_esi_preserve_list = array();
-    private $_nonce_actions = array( -1 => '' ); // val is cache control
+    private $_nonce_actions = array(-1 => ''); // val is cache control
 
     const QS_ACTION = 'lsesi';
@@ -39 +44 @@
      * @since  4.0 Change to be after Vary init in hook 'after_setup_theme'
      */
-    public function init() {
+    public function init()
+    {
         /**
          * Bypass ESI related funcs if disabled ESI to fix potential DIVI compatibility issue
          * @since  2.9.7.2
          */
-        if ( Router::is_ajax() || ! $this->cls( 'Router' )->esi_enabled() ) {
+        if (Router::is_ajax() || !$this->cls('Router')->esi_enabled()) {
             return;
         }
 
         // Guest mode, don't need to use ESI
-        if ( defined( 'LITESPEED_GUEST' ) && LITESPEED_GUEST ) {
-            return;
-        }
-
-        if ( defined( 'LITESPEED_ESI_OFF' ) ) {
+        if (defined('LITESPEED_GUEST') && LITESPEED_GUEST) {
+            return;
+        }
+
+        if (defined('LITESPEED_ESI_OFF')) {
             return;
         }
@@ -66 +72 @@
         $this->_transform_nonce();
 
-        ! defined( 'LITESPEED_ESI_INITED' ) && define( 'LITESPEED_ESI_INITED', true );
+        !defined('LITESPEED_ESI_INITED') && define('LITESPEED_ESI_INITED', true);
     }
 
@@ -78 +84 @@
      * @access private
      */
-    private function _hooks() {
-        add_filter( 'template_include', array( $this, 'esi_template' ), 99999 );
-
-        add_action( 'load-widgets.php', __NAMESPACE__ . '\Purge::purge_widget' );
-        add_action( 'wp_update_comment_count', __NAMESPACE__ . '\Purge::purge_comment_widget' );
+    private function _hooks()
+    {
+        add_filter('template_include', array($this, 'esi_template'), 99999);
+
+        add_action('load-widgets.php', __NAMESPACE__ . '\Purge::purge_widget');
+        add_action('wp_update_comment_count', __NAMESPACE__ . '\Purge::purge_comment_widget');
 
         /**
@@ -88 +95 @@
          * @since  1.8.1
          */
-        if ( ! empty( $_GET[ self::QS_ACTION ] ) ) {
+        if (!empty($_GET[self::QS_ACTION])) {
+            self::debug('ESI req');
             $this->_register_esi_actions();
         }
@@ -106 +114 @@
          * @since  2.8.1 Check is_admin for Elementor compatibility #726013
          */
-        if ( ! is_admin() ) {
-            add_shortcode( 'esi', array( $this, 'shortcode' ) );
-        }
-
+        if (!is_admin()) {
+            add_shortcode('esi', array($this, 'shortcode'));
+        }
     }
 
@@ -117 +124 @@
      * @since  2.9.5
      */
-    private function _transform_nonce() {
-        if ( is_admin() ) {
+    private function _transform_nonce()
+    {
+        if (is_admin()) {
             return;
         }
 
         // Load ESI nonces in conf
-        $nonces = $this->conf( Base::O_ESI_NONCE );
-        add_filter( 'litespeed_esi_nonces', array( $this->cls( 'Data' ), 'load_esi_nonces' ) );
-        if ( $nonces = apply_filters( 'litespeed_esi_nonces', $nonces ) ) {
-            foreach ( $nonces as $action ) {
-                $this->nonce_action( $action );
-            }
-        }
-
-        add_action( 'litespeed_nonce', array( $this, 'nonce_action' ) );
+        $nonces = $this->conf(Base::O_ESI_NONCE);
+        add_filter('litespeed_esi_nonces', array($this->cls('Data'), 'load_esi_nonces'));
+        if ($nonces = apply_filters('litespeed_esi_nonces', $nonces)) {
+            foreach ($nonces as $action) {
+                $this->nonce_action($action);
+            }
+        }
+
+        add_action('litespeed_nonce', array($this, 'nonce_action'));
     }
 
@@ -139 +147 @@
      * @since  2.9.5
      */
-    public function nonce_action( $action ) {
+    public function nonce_action($action)
+    {
         // Split the Cache Control
-        $action = explode( ' ', $action );
-        $control = ! empty( $action[ 1 ] ) ? $action[ 1 ] : '';
-        $action = $action[ 0 ];
+        $action = explode(' ', $action);
+        $control = !empty($action[1]) ? $action[1] : '';
+        $action = $action[0];
 
         // Wildcard supported
-        $action = Utility::wildcard2regex( $action );
-
-        if ( array_key_exists( $action, $this->_nonce_actions ) ) {
-            return;
-        }
-
-        $this->_nonce_actions[ $action ] = $control;
-
-        Debug2::debug( '[ESI] Appended nonce action to nonce list [action] ' . $action );
+        $action = Utility::wildcard2regex($action);
+
+        if (array_key_exists($action, $this->_nonce_actions)) {
+            return;
+        }
+
+        $this->_nonce_actions[$action] = $control;
+
+        Debug2::debug('[ESI] Appended nonce action to nonce list [action] ' . $action);
     }
 
@@ -162 +171 @@
      * @since 2.9.5
      */
-    public function is_nonce_action( $action ) {
+    public function is_nonce_action($action)
+    {
         // If GM not run yet, then ESI not init yet, then ESI nonce will not be allowed even nonce func replaced.
-        if ( ! defined( 'LITESPEED_ESI_INITED' ) ) {
+        if (!defined('LITESPEED_ESI_INITED')) {
             return null;
         }
 
-        if ( is_admin() ) {
+        if (is_admin()) {
             return null;
         }
 
-        if ( defined( 'LITESPEED_ESI_OFF' ) ) {
+        if (defined('LITESPEED_ESI_OFF')) {
             return null;
         }
 
-        foreach ( $this->_nonce_actions as $k => $v ) {
-            if ( strpos( $k, '*' ) !== false ) {
-                if( preg_match( '#' . $k . '#iU', $action ) ) {
+        foreach ($this->_nonce_actions as $k => $v) {
+            if (strpos($k, '*') !== false) {
+                if (preg_match('#' . $k . '#iU', $action)) {
                     return $v;
                 }
-            }
-            else {
-                if ( $k == $action ) {
+            } else {
+                if ($k == $action) {
                     return $v;
                 }
@@ -198 +207 @@
      * @access public
      */
-    public function shortcode( $atts ) {
-        if ( empty( $atts[ 0 ] ) ) {
-            Debug2::debug( '[ESI] ===shortcode wrong format', $atts );
+    public function shortcode($atts)
+    {
+        if (empty($atts[0])) {
+            Debug2::debug('[ESI] ===shortcode wrong format', $atts);
             return 'Wrong shortcode esi format';
         }
 
         $cache = 'public,no-vary';
-        if ( ! empty( $atts[ 'cache' ] ) ) {
-            $cache = $atts[ 'cache' ];
-            unset( $atts[ 'cache' ] );
+        if (!empty($atts['cache'])) {
+            $cache = $atts['cache'];
+            unset($atts['cache']);
         }
 
         $silence = false;
-        if ( ! empty( $atts[ '_ls_silence' ] ) ) {
+        if (!empty($atts['_ls_silence'])) {
             $silence = true;
         }
 
-        do_action( 'litespeed_esi_shortcode-' . $atts[ 0 ] );
+        do_action('litespeed_esi_shortcode-' . $atts[0]);
 
         // Show ESI link
-        return $this->sub_esi_block( 'esi', 'esi-shortcode', $atts, $cache, $silence );
+        return $this->sub_esi_block('esi', 'esi-shortcode', $atts, $cache, $silence);
     }
 
@@ -229 +239 @@
      * @return string Esi On header if request has esi, empty string otherwise.
      */
-    public static function has_esi() {
+    public static function has_esi()
+    {
         return self::$has_esi;
     }
@@ -239 +250 @@
      * @access public
      */
-    public static function set_has_esi() {
+    public static function set_has_esi()
+    {
         self::$has_esi = true;
     }
@@ -250 +262 @@
      * @access   private
      */
-    private function _register_esi_actions() {
-        ! defined( 'LSCACHE_IS_ESI' ) && define( 'LSCACHE_IS_ESI', $_GET[ self::QS_ACTION ] );// Reused this to ESI block ID
-
-        ! empty( $_SERVER[ 'ESI_REFERER' ] ) && defined( 'LSCWP_LOG' ) && Debug2::debug( '[ESI] ESI_REFERER: ' . $_SERVER[ 'ESI_REFERER' ] );
+    private function _register_esi_actions()
+    {
+        /**
+         * This hook is in `init`
+         * For any plugin need to check if page is ESI, use `LSCACHE_IS_ESI` check after `init` hook
+         */
+        !defined('LSCACHE_IS_ESI') && define('LSCACHE_IS_ESI', $_GET[self::QS_ACTION]); // Reused this to ESI block ID
+
+        !empty($_SERVER['ESI_REFERER']) && defined('LSCWP_LOG') && Debug2::debug('[ESI] ESI_REFERER: ' . $_SERVER['ESI_REFERER']);
 
         /**
@@ -259 +276 @@
          * @since 2.9.3
          */
-        if ( ! empty( $_SERVER[ 'ESI_REFERER' ] ) && ! $this->cls( 'REST' )->is_rest( $_SERVER[ 'ESI_REFERER' ] ) ) {
-            $_SERVER[ 'REQUEST_URI' ] = $_SERVER[ 'ESI_REFERER' ];
-        }
-
-        if ( ! empty( $_SERVER[ 'ESI_CONTENT_TYPE' ] ) && strpos( $_SERVER[ 'ESI_CONTENT_TYPE' ], 'application/json' ) === 0 ) {
-            add_filter( 'litespeed_is_json', '__return_true' );
+        if (!empty($_SERVER['ESI_REFERER']) && !$this->cls('REST')->is_rest($_SERVER['ESI_REFERER'])) {
+            self::debug('overwrite REQUEST_URI to ESI_REFERER [from] ' . $_SERVER['REQUEST_URI'] . ' [to] ' . $_SERVER['ESI_REFERER']);
+            $_SERVER['REQUEST_URI'] = trailingslashit($_SERVER['ESI_REFERER']);
+            # Prevent from 301 redirecting
+            if (!empty($_SERVER['SCRIPT_URI'])) {
+                $SCRIPT_URI = parse_url($_SERVER['SCRIPT_URI']);
+                $SCRIPT_URI['path'] = $_SERVER['REQUEST_URI'];
+                Utility::compatibility();
+                $_SERVER['SCRIPT_URI'] = http_build_url($SCRIPT_URI);
+            }
+        }
+
+        if (!empty($_SERVER['ESI_CONTENT_TYPE']) && strpos($_SERVER['ESI_CONTENT_TYPE'], 'application/json') === 0) {
+            add_filter('litespeed_is_json', '__return_true');
         }
 
@@ -272 +297 @@
          * @since 2.9.4
          */
-        add_action( 'rest_api_init', array( $this, 'load_esi_block' ), 101 );
+        add_action('rest_api_init', array($this, 'load_esi_block'), 101);
 
         // Register ESI blocks
@@ -279 +304 @@
         add_action('litespeed_esi_load-comment-form', array($this, 'load_comment_form_block'));
 
-        add_action('litespeed_esi_load-nonce', array( $this, 'load_nonce_block' ) );
-        add_action('litespeed_esi_load-esi', array( $this, 'load_esi_shortcode' ) );
-
-        add_action('litespeed_esi_load-' . self::COMBO, array( $this, 'load_combo' ) );
+        add_action('litespeed_esi_load-nonce', array($this, 'load_nonce_block'));
+        add_action('litespeed_esi_load-esi', array($this, 'load_esi_shortcode'));
+
+        add_action('litespeed_esi_load-' . self::COMBO, array($this, 'load_combo'));
     }
 
@@ -294 +319 @@
      * @return string The new template path.
      */
-    public function esi_template( $template ) {
+    public function esi_template($template)
+    {
         // Check if is an ESI request
-        if ( defined( 'LSCACHE_IS_ESI' ) ) {
-            Debug2::debug( '[ESI] calling template' );
+        if (defined('LSCACHE_IS_ESI')) {
+            self::debug('calling ESI template');
 
             return LSCWP_DIR . 'tpl/esi.tpl.php';
         }
+        self::debug('calling default template');
         $this->_register_not_esi_actions();
         return $template;
@@ -312 +339 @@
      * @access   private
      */
-    private function _register_not_esi_actions() {
-        do_action( 'litespeed_tpl_normal' );
-
-        if ( ! Control::is_cacheable() ) {
-            return;
-        }
-
-        if ( Router::is_ajax() ) {
-            return;
-        }
-
-        add_filter('widget_display_callback', array( $this, 'sub_widget_block' ), 0, 3);
+    private function _register_not_esi_actions()
+    {
+        do_action('litespeed_tpl_normal');
+
+        if (!Control::is_cacheable()) {
+            return;
+        }
+
+        if (Router::is_ajax()) {
+            return;
+        }
+
+        add_filter('widget_display_callback', array($this, 'sub_widget_block'), 0, 3);
 
         // Add admin_bar esi
-        if ( Router::is_logged_in() ) {
+        if (Router::is_logged_in()) {
             remove_action('wp_footer', 'wp_admin_bar_render', 1000);
             add_action('wp_footer', array($this, 'sub_admin_bar_block'), 1000);
@@ -332 +360 @@
 
         // Add comment forum esi for logged-in user or commenter
-        if ( ! Router::is_ajax() && Vary::has_vary() ) {
-            add_filter( 'comment_form_defaults', array( $this, 'register_comment_form_actions' ) );
-        }
-
+        if (!Router::is_ajax() && Vary::has_vary()) {
+            add_filter('comment_form_defaults', array($this, 'register_comment_form_actions'));
+        }
     }
 
@@ -343 +370 @@
      * @since  3.4.2
      */
-    public static function combine( $block_id ) {
-        if ( ! isset( $_SERVER[ 'X-LSCACHE' ] ) || strpos( $_SERVER[ 'X-LSCACHE' ], 'combine' ) === false ) {
-            return;
-        }
-
-        if ( in_array( $block_id, self::$_combine_ids ) ) {
+    public static function combine($block_id)
+    {
+        if (!isset($_SERVER['X-LSCACHE']) || strpos($_SERVER['X-LSCACHE'], 'combine') === false) {
+            return;
+        }
+
+        if (in_array($block_id, self::$_combine_ids)) {
             return;
         }
@@ -360 +388 @@
      * @since  3.4.2
      */
-    public function load_combo() {
-        Control::set_nocache( 'ESI combine request' );
-
-        if ( empty( $_POST[ 'esi_include' ] ) ) {
+    public function load_combo()
+    {
+        Control::set_nocache('ESI combine request');
+
+        if (empty($_POST['esi_include'])) {
             return;
         }
@@ -369 +398 @@
         self::set_has_esi();
 
-        Debug2::debug( '[ESI] 🍔 Load combo', $_POST[ 'esi_include' ] );
+        Debug2::debug('[ESI] 🍔 Load combo', $_POST['esi_include']);
 
         $output = '';
-        foreach ( $_POST[ 'esi_include' ] as $url ) {
-            $qs = parse_url( htmlspecialchars_decode( $url ), PHP_URL_QUERY );
-            parse_str( $qs, $qs );
-            if ( empty( $qs[ self::QS_ACTION ] ) ) {
+        foreach ($_POST['esi_include'] as $url) {
+            $qs = parse_url(htmlspecialchars_decode($url), PHP_URL_QUERY);
+            parse_str($qs, $qs);
+            if (empty($qs[self::QS_ACTION])) {
                 continue;
             }
-            $esi_id = $qs[ self::QS_ACTION ];
-            $esi_param = ! empty( $qs[ self::QS_PARAMS ] ) ? $this->_parse_esi_param( $qs[ self::QS_PARAMS ] ) : false;
-            $inline_param = apply_filters( 'litespeed_esi_inline-' . $esi_id, array(), $esi_param ); // Returned array need to be [ val, control, tag ]
-            if ( $inline_param ) {
-                $output .= self::_build_inline( $url, $inline_param );
+            $esi_id = $qs[self::QS_ACTION];
+            $esi_param = !empty($qs[self::QS_PARAMS]) ? $this->_parse_esi_param($qs[self::QS_PARAMS]) : false;
+            $inline_param = apply_filters('litespeed_esi_inline-' . $esi_id, array(), $esi_param); // Returned array need to be [ val, control, tag ]
+            if ($inline_param) {
+                $output .= self::_build_inline($url, $inline_param);
             }
         }
@@ -394 +423 @@
      * @since  3.4.2
      */
-    private static function _build_inline( $url, $inline_param ) {
-        if ( ! $url || empty( $inline_param[ 'val' ] ) || empty( $inline_param[ 'control' ] ) || empty( $inline_param[ 'tag' ] ) ) {
+    private static function _build_inline($url, $inline_param)
+    {
+        if (!$url || empty($inline_param['val']) || empty($inline_param['control']) || empty($inline_param['tag'])) {
             return '';
         }
 
-        return "<esi:inline name='$url' cache-control='" . $inline_param[ 'control' ] . "' cache-tag='" . $inline_param[ 'tag' ] . "'>" . $inline_param[ 'val' ] . "</esi:inline>";
+        $url = esc_attr($url);
+        $control = esc_attr($inline_param['control']);
+        $tag = esc_attr($inline_param['tag']);
+
+        return "<esi:inline name='$url' cache-control='" . $control . "' cache-tag='" . $tag . "'>" . $inline_param['val'] . "</esi:inline>";
     }
 
@@ -418 +452 @@
      * @param array $inline_val     If show the current value for current request( this can avoid multiple esi requests in first time cache generating process )
      */
-    public function sub_esi_block( $block_id, $wrapper, $params = array(), $control = 'private,no-vary', $silence = false, $preserved = false, $svar = false, $inline_param = array() ) {
-        if ( empty($block_id) || ! is_array($params) || preg_match('/[^\w-]/', $block_id) ) {
+    public function sub_esi_block($block_id, $wrapper, $params = array(), $control = 'private,no-vary', $silence = false, $preserved = false, $svar = false, $inline_param = array())
+    {
+        if (empty($block_id) || !is_array($params) || preg_match('/[^\w-]/', $block_id)) {
             return false;
         }
 
-        if ( defined( 'LITESPEED_ESI_OFF' ) ) {
-            Debug2::debug( '[ESI] ESI OFF so force loading [block_id] ' . $block_id );
-            do_action( 'litespeed_esi_load-' . $block_id, $params );
-            return;
-        }
-
-        if ( $silence ) {
+        if (defined('LITESPEED_ESI_OFF')) {
+            Debug2::debug('[ESI] ESI OFF so force loading [block_id] ' . $block_id);
+            do_action('litespeed_esi_load-' . $block_id, $params);
+            return;
+        }
+
+        if ($silence) {
             // Don't add comment to esi block ( original for nonce used in tag property data-nonce='esi_block' )
-            $params[ '_ls_silence' ] = true;
-        }
-
-        if ( $this->cls( 'REST' )->is_rest() || $this->cls( 'REST' )->is_internal_rest() ) {
-            $params[ 'is_json' ] = 1;
-        }
-
-        $params = apply_filters( 'litespeed_esi_params', $params, $block_id );
-        $control = apply_filters('litespeed_esi_control', $control, $block_id );
-
-        if ( !is_array($params) || !is_string($control) ) {
-            defined( 'LSCWP_LOG' ) && Debug2::debug( "[ESI] 🛑 Sub hooks returned Params: \n" . var_export($params, true) . "\ncache control: \n" . var_export($control, true) );
+            $params['_ls_silence'] = true;
+        }
+
+        if ($this->cls('REST')->is_rest() || $this->cls('REST')->is_internal_rest()) {
+            $params['is_json'] = 1;
+        }
+
+        $params = apply_filters('litespeed_esi_params', $params, $block_id);
+        $control = apply_filters('litespeed_esi_control', $control, $block_id);
+
+        if (!is_array($params) || !is_string($control)) {
+            defined('LSCWP_LOG') && Debug2::debug("[ESI] 🛑 Sub hooks returned Params: \n" . var_export($params, true) . "\ncache control: \n" . var_export($control, true));
 
             return false;
@@ -451 +486 @@
             self::QS_ACTION => $block_id,
         );
-        if ( ! empty( $control ) ) {
-            $appended_params[ '_control' ] = $control;
-        }
-        if ( $params ) {
-            $appended_params[ self::QS_PARAMS ] = base64_encode( json_encode( $params ) );
-            Debug2::debug2( '[ESI] param ', $params );
+        if (!empty($control)) {
+            $appended_params['_control'] = $control;
+        }
+        if ($params) {
+            $appended_params[self::QS_PARAMS] = base64_encode(json_encode($params));
+            Debug2::debug2('[ESI] param ', $params);
         }
 
         // Append hash
-        $appended_params[ '_hash' ] = $this->_gen_esi_md5( $appended_params );
+        $appended_params['_hash'] = $this->_gen_esi_md5($appended_params);
 
         /**
@@ -466 +501 @@
          * @since 2.9.4
          */
-        $appended_params = array_map( 'urlencode', $appended_params );
+        $appended_params = array_map('urlencode', $appended_params);
 
         // Generate ESI URL
-        $url = add_query_arg( $appended_params, trailingslashit( wp_make_link_relative( home_url() ) ) );
+        $url = add_query_arg($appended_params, trailingslashit(wp_make_link_relative(home_url())));
 
         $output = '';
-        if ( $inline_param ) {
-            $output .= self::_build_inline( $url, $inline_param );
+        if ($inline_param) {
+            $output .= self::_build_inline($url, $inline_param);
         }
 
         $output .= "<esi:include src='$url'";
-        if ( ! empty( $control ) ) {
+        if (!empty($control)) {
+            $control = esc_attr($control);
             $output .= " cache-control='$control'";
         }
-        if ( $svar ) {
+        if ($svar) {
             $output .= " as-var='1'";
         }
-        if ( in_array( $block_id, self::$_combine_ids ) ) {
+        if (in_array($block_id, self::$_combine_ids)) {
             $output .= " combine='sub'";
         }
-        if ( $block_id == self::COMBO && isset( $_SERVER[ 'X-LSCACHE' ] ) && strpos( $_SERVER[ 'X-LSCACHE' ], 'combine' ) !== false ) {
+        if ($block_id == self::COMBO && isset($_SERVER['X-LSCACHE']) && strpos($_SERVER['X-LSCACHE'], 'combine') !== false) {
             $output .= " combine='main'";
         }
         $output .= " />";
 
-        if ( ! $silence ) {
+        if (!$silence) {
             $output = "<!-- lscwp $wrapper -->$output<!-- lscwp $wrapper esi end -->";
         }
 
-        Debug2::debug( "[ESI] 💕  [BLock_ID] $block_id \t[wrapper] $wrapper \t\t[Control] $control" );
-        Debug2::debug2( $output );
+        self::debug("💕  [BLock_ID] $block_id \t[wrapper] $wrapper \t\t[Control] $control");
+        self::debug2($output);
 
         self::set_has_esi();
@@ -502 +538 @@
         // Convert to string to avoid html chars filter when using
         // Will reverse the buffer when output in self::finalize()
-        if ( $preserved ) {
-            $hash = md5( $output );
-            $this->_esi_preserve_list[ $hash ] = $output;
-            Debug2::debug( "[ESI] Preserved to $hash" );
+        if ($preserved) {
+            $hash = md5($output);
+            $this->_esi_preserve_list[$hash] = $output;
+            self::debug("Preserved to $hash");
 
             return $hash;
@@ -519 +555 @@
      * @access private
      */
-    private function _gen_esi_md5( $params ) {
+    private function _gen_esi_md5($params)
+    {
         $keys = array(
             self::QS_ACTION,
@@ -527 +564 @@
 
         $str = '';
-        foreach ( $keys as $v ) {
-            if ( isset( $params[ $v ] ) && is_string( $params[ $v ] ) ) {
-                $str .= $params[ $v ];
-            }
-        }
-        Debug2::debug2( '[ESI] md5_string=' . $str );
-
-        return md5( $this->conf( Base::HASH ) . $str );
+        foreach ($keys as $v) {
+            if (isset($params[$v]) && is_string($params[$v])) {
+                $str .= $params[$v];
+            }
+        }
+        Debug2::debug2('[ESI] md5_string=' . $str);
+
+        return md5($this->conf(Base::HASH) . $str);
     }
 
@@ -543 +580 @@
      * @access private
      */
-    private function _parse_esi_param( $qs_params = false ) {
+    private function _parse_esi_param($qs_params = false)
+    {
         $req_params = false;
-        if ( $qs_params ) {
+        if ($qs_params) {
             $req_params = $qs_params;
-        }
-        elseif ( isset( $_REQUEST[ self::QS_PARAMS ] ) ) {
-            $req_params = $_REQUEST[ self::QS_PARAMS ];
-        }
-
-        if ( ! $req_params ) {
+        } elseif (isset($_REQUEST[self::QS_PARAMS])) {
+            $req_params = $_REQUEST[self::QS_PARAMS];
+        }
+
+        if (!$req_params) {
             return false;
         }
 
-        $unencrypted = base64_decode( $req_params );
-        if ( $unencrypted === false ) {
+        $unencrypted = base64_decode($req_params);
+        if ($unencrypted === false) {
             return false;
         }
 
-        Debug2::debug2( '[ESI] parms', $unencrypted );
+        Debug2::debug2('[ESI] parms', $unencrypted);
         // $unencoded = urldecode($unencrypted); no need to do this as $_GET is already parsed
-        $params = json_decode( $unencrypted, true );
+        $params = json_decode($unencrypted, true);
 
         return $params;
@@ -574 +611 @@
      * @access public
      */
-    public function load_esi_block() {
+    public function load_esi_block()
+    {
         /**
          * Validate if is a legal ESI req
          * @since 2.9.6
          */
-        if ( empty( $_GET[ '_hash' ] ) || $this->_gen_esi_md5( $_GET ) != $_GET[ '_hash' ] ) {
-            Debug2::debug( '[ESI] ❌ Failed to validate _hash' );
+        if (empty($_GET['_hash']) || $this->_gen_esi_md5($_GET) != $_GET['_hash']) {
+            Debug2::debug('[ESI] ❌ Failed to validate _hash');
             return;
         }
@@ -586 +624 @@
         $params = $this->_parse_esi_param();
 
-        if ( defined( 'LSCWP_LOG' ) ) {
+        if (defined('LSCWP_LOG')) {
             $logInfo = '[ESI] ⭕ ';
-            if( ! empty( $params[ self::PARAM_NAME ] ) ) {
-                $logInfo .= ' Name: ' . $params[ self::PARAM_NAME ] . ' ----- ';
+            if (!empty($params[self::PARAM_NAME])) {
+                $logInfo .= ' Name: ' . $params[self::PARAM_NAME] . ' ----- ';
             }
             $logInfo .= ' [ID] ' . LSCACHE_IS_ESI;
-            Debug2::debug( $logInfo );
-        }
-
-        if ( ! empty( $params[ '_ls_silence' ] ) ) {
-            ! defined( 'LSCACHE_ESI_SILENCE' ) && define( 'LSCACHE_ESI_SILENCE', true );
+            Debug2::debug($logInfo);
+        }
+
+        if (!empty($params['_ls_silence'])) {
+            !defined('LSCACHE_ESI_SILENCE') && define('LSCACHE_ESI_SILENCE', true);
         }
 
@@ -603 +641 @@
          * @since  2.9.4
          */
-        if ( ! empty( $params[ 'is_json' ] ) ) {
-            add_filter( 'litespeed_is_json', '__return_true' );
-        }
-
-        Tag::add( rtrim( Tag::TYPE_ESI, '.' ) );
-        Tag::add( Tag::TYPE_ESI . LSCACHE_IS_ESI );
+        if (!empty($params['is_json'])) {
+            add_filter('litespeed_is_json', '__return_true');
+        }
+
+        Tag::add(rtrim(Tag::TYPE_ESI, '.'));
+        Tag::add(Tag::TYPE_ESI . LSCACHE_IS_ESI);
 
         // Debug2::debug(var_export($params, true ));
@@ -617 +655 @@
          * @since  2.2.3
          */
-        if ( ! empty( $_GET[ '_control' ] ) ) {
-            $control = explode( ',', $_GET[ '_control' ] );
-            if ( in_array( 'private', $control ) ) {
+        if (!empty($_GET['_control'])) {
+            $control = explode(',', $_GET['_control']);
+            if (in_array('private', $control)) {
                 Control::set_private();
             }
 
-            if ( in_array( 'no-vary', $control ) ) {
+            if (in_array('no-vary', $control)) {
                 Control::set_no_vary();
             }
@@ -631 +669 @@
     }
 
-// The *_sub_* functions are helpers for the sub_* functions.
-// The *_load_* functions are helpers for the load_* functions.
+    // The *_sub_* functions are helpers for the sub_* functions.
+    // The *_load_* functions are helpers for the load_* functions.
 
     /**
@@ -640 +678 @@
      * @access public
      */
-    public static function widget_default_options($options, $widget) {
-        if ( ! is_array($options) ) {
+    public static function widget_default_options($options, $widget)
+    {
+        if (!is_array($options)) {
             return $options;
         }
@@ -647 +686 @@
         $widget_name = get_class($widget);
         switch ($widget_name) {
-            case 'WP_Widget_Recent_Posts' :
-            case 'WP_Widget_Recent_Comments' :
+            case 'WP_Widget_Recent_Posts':
+            case 'WP_Widget_Recent_Comments':
                 $options[self::WIDGET_O_ESIENABLE] = Base::VAL_OFF;
                 $options[self::WIDGET_O_TTL] = 86400;
                 break;
-            default :
+            default:
                 break;
         }
@@ -670 +709 @@
      * @return mixed Return false if display through esi, instance otherwise.
      */
-    public function sub_widget_block( $instance, $widget, $args ) {
+    public function sub_widget_block($instance, $widget, $args)
+    {
         // #210407
-        if ( ! is_array( $instance ) ) {
+        if (!is_array($instance)) {
             return $instance;
         }
 
-        $name = get_class( $widget );
-        if ( ! isset( $instance[ Base::OPTION_NAME ] ) ) {
+        $name = get_class($widget);
+        if (!isset($instance[Base::OPTION_NAME])) {
             return $instance;
         }
-        $options = $instance[ Base::OPTION_NAME ];
-        if ( ! isset( $options ) || ! $options[ self::WIDGET_O_ESIENABLE ] ) {
-            defined( 'LSCWP_LOG' ) && Debug2::debug( 'ESI 0 ' . $name . ': '. ( ! isset( $options ) ? 'not set' : 'set off' ) );
+        $options = $instance[Base::OPTION_NAME];
+        if (!isset($options) || !$options[self::WIDGET_O_ESIENABLE]) {
+            defined('LSCWP_LOG') && Debug2::debug('ESI 0 ' . $name . ': ' . (!isset($options) ? 'not set' : 'set off'));
 
             return $instance;
         }
 
-        $esi_private = $options[ self::WIDGET_O_ESIENABLE ] == Base::VAL_ON2 ? 'private,' : '';
+        $esi_private = $options[self::WIDGET_O_ESIENABLE] == Base::VAL_ON2 ? 'private,' : '';
 
         $params = array(
@@ -696 +736 @@
         );
 
-        echo $this->sub_esi_block( 'widget', 'widget ' . $name, $params, $esi_private . 'no-vary' );
+        echo $this->sub_esi_block('widget', 'widget ' . $name, $params, $esi_private . 'no-vary');
 
         return false;
@@ -709 +749 @@
      * @global type $wp_admin_bar
      */
-    public function sub_admin_bar_block() {
+    public function sub_admin_bar_block()
+    {
         global $wp_admin_bar;
 
-        if ( ! is_admin_bar_showing() || ! is_object($wp_admin_bar) ) {
+        if (!is_admin_bar_showing() || !is_object($wp_admin_bar)) {
             return;
         }
@@ -718 +759 @@
         // To make each admin bar ESI request different for `Edit` button different link
         $params = array(
-            'ref' => $_SERVER[ 'REQUEST_URI' ],
+            'ref' => $_SERVER['REQUEST_URI'],
         );
 
-        echo $this->sub_esi_block( 'admin-bar', 'adminbar', $params );
+        echo $this->sub_esi_block('admin-bar', 'adminbar', $params);
     }
 
@@ -732 +773 @@
      * @param array $params Input parameters needed to correctly display widget
      */
-    public function load_widget_block( $params ) {
+    public function load_widget_block($params)
+    {
         // global $wp_widget_factory;
         // $widget = $wp_widget_factory->widgets[ $params[ self::PARAM_NAME ] ];
-        $option = $params[ self::PARAM_INSTANCE ];
-        $option = $option[ Base::OPTION_NAME ];
+        $option = $params[self::PARAM_INSTANCE];
+        $option = $option[Base::OPTION_NAME];
 
         // Since we only reach here via esi, safe to assume setting exists.
-        $ttl = $option[ self::WIDGET_O_TTL ];
-        defined( 'LSCWP_LOG' ) && Debug2::debug( 'ESI widget render: name ' . $params[ self::PARAM_NAME ] . ', id ' . $params[ self::PARAM_ID ] . ', ttl ' . $ttl );
-        if ( $ttl == 0 ) {
-            Control::set_nocache( 'ESI Widget time to live set to 0' );
-        }
-        else {
-            Control::set_custom_ttl( $ttl );
-
-            if ( $option[ self::WIDGET_O_ESIENABLE ] == Base::VAL_ON2 ) {
+        $ttl = $option[self::WIDGET_O_TTL];
+        defined('LSCWP_LOG') && Debug2::debug('ESI widget render: name ' . $params[self::PARAM_NAME] . ', id ' . $params[self::PARAM_ID] . ', ttl ' . $ttl);
+        if ($ttl == 0) {
+            Control::set_nocache('ESI Widget time to live set to 0');
+        } else {
+            Control::set_custom_ttl($ttl);
+
+            if ($option[self::WIDGET_O_ESIENABLE] == Base::VAL_ON2) {
                 Control::set_private();
             }
             Control::set_no_vary();
-            Tag::add( Tag::TYPE_WIDGET . $params[ self::PARAM_ID ] );
-        }
-        the_widget( $params[ self::PARAM_NAME ], $params[ self::PARAM_INSTANCE ], $params[ self::PARAM_ARGS ] );
+            Tag::add(Tag::TYPE_WIDGET . $params[self::PARAM_ID]);
+        }
+        the_widget($params[self::PARAM_NAME], $params[self::PARAM_INSTANCE], $params[self::PARAM_ARGS]);
     }
 
@@ -762 +803 @@
      * @since 1.1.3
      */
-    public function load_admin_bar_block( $params ) {
-
-        if ( ! empty( $params[ 'ref' ] ) ) {
-            $ref_qs = parse_url( $params[ 'ref' ], PHP_URL_QUERY );
-            if ( ! empty( $ref_qs ) ) {
-                parse_str( $ref_qs, $ref_qs_arr );
-
-                if ( ! empty( $ref_qs_arr ) ) {
-                    foreach ( $ref_qs_arr as $k => $v ) {
-                        $_GET[ $k ] = $v;
+    public function load_admin_bar_block($params)
+    {
+
+        if (!empty($params['ref'])) {
+            $ref_qs = parse_url($params['ref'], PHP_URL_QUERY);
+            if (!empty($ref_qs)) {
+                parse_str($ref_qs, $ref_qs_arr);
+
+                if (!empty($ref_qs_arr)) {
+                    foreach ($ref_qs_arr as $k => $v) {
+                        $_GET[$k] = $v;
                     }
                 }
@@ -778 +820 @@
 
         wp_admin_bar_render();
-        if ( ! $this->conf( Base::O_ESI_CACHE_ADMBAR ) ) {
-            Control::set_nocache( 'build-in set to not cacheable' );
-        }
-        else {
+        if (!$this->conf(Base::O_ESI_CACHE_ADMBAR)) {
+            Control::set_nocache('build-in set to not cacheable');
+        } else {
             Control::set_private();
             Control::set_no_vary();
         }
 
-        defined( 'LSCWP_LOG' ) && Debug2::debug( 'ESI: adminbar ref: ' . $_SERVER[ 'REQUEST_URI' ] );
+        defined('LSCWP_LOG') && Debug2::debug('ESI: adminbar ref: ' . $_SERVER['REQUEST_URI']);
     }
 
@@ -797 +838 @@
      * @param array $params Input parameters needed to correctly display comment form
      */
-    public function load_comment_form_block( $params ) {
-        comment_form( $params[ self::PARAM_ARGS ], $params[ self::PARAM_ID ] );
-
-        if ( ! $this->conf( Base::O_ESI_CACHE_COMMFORM ) ) {
-            Control::set_nocache( 'build-in set to not cacheable' );
-        }
-        else {
+    public function load_comment_form_block($params)
+    {
+        comment_form($params[self::PARAM_ARGS], $params[self::PARAM_ID]);
+
+        if (!$this->conf(Base::O_ESI_CACHE_COMMFORM)) {
+            Control::set_nocache('build-in set to not cacheable');
+        } else {
             // by default comment form is public
-            if ( Vary::has_vary() ) {
+            if (Vary::has_vary()) {
                 Control::set_private();
                 Control::set_no_vary();
@@ -818 +859 @@
      * @since 2.6
      */
-    public function load_nonce_block( $params ) {
-        $action = $params[ 'action' ];
-
-        Debug2::debug( '[ESI] load_nonce_block [action] ' . $action );
+    public function load_nonce_block($params)
+    {
+        $action = $params['action'];
+
+        Debug2::debug('[ESI] load_nonce_block [action] ' . $action);
 
         // set nonce TTL to half day
-        Control::set_custom_ttl( 43200 );
-
-        if ( Router::is_logged_in() ) {
+        Control::set_custom_ttl(43200);
+
+        if (Router::is_logged_in()) {
             Control::set_private();
         }
 
-        if ( function_exists( 'wp_create_nonce_litespeed_esi' ) ) {
-            echo wp_create_nonce_litespeed_esi( $action );
-        }
-        else {
-            echo wp_create_nonce( $action );
+        if (function_exists('wp_create_nonce_litespeed_esi')) {
+            echo wp_create_nonce_litespeed_esi($action);
+        } else {
+            echo wp_create_nonce($action);
         }
     }
@@ -844 +885 @@
      * @since 2.8
      */
-    public function load_esi_shortcode( $params ) {
-        if ( isset( $params[ 'ttl' ] ) ) {
-            if ( ! $params[ 'ttl' ] ) {
-                Control::set_nocache( 'ESI shortcode att ttl=0' );
-            }
-            else {
-                Control::set_custom_ttl( $params[ 'ttl' ] );
-            }
-            unset( $params[ 'ttl' ] );
+    public function load_esi_shortcode($params)
+    {
+        if (isset($params['ttl'])) {
+            if (!$params['ttl']) {
+                Control::set_nocache('ESI shortcode att ttl=0');
+            } else {
+                Control::set_custom_ttl($params['ttl']);
+            }
+            unset($params['ttl']);
         }
 
         // Replace to original shortcode
-        $shortcode = $params[ 0 ];
+        $shortcode = $params[0];
         $atts_ori = array();
-        foreach ( $params as $k => $v ) {
-            if ( $k === 0 ) {
+        foreach ($params as $k => $v) {
+            if ($k === 0) {
                 continue;
             }
 
-            $atts_ori[] = is_string( $k ) ? "$k='" . addslashes( $v ) . "'" : $v;
-        }
-
-        Tag::add( Tag::TYPE_ESI . "esi.$shortcode" );
+            $atts_ori[] = is_string($k) ? "$k='" . addslashes($v) . "'" : $v;
+        }
+
+        Tag::add(Tag::TYPE_ESI . "esi.$shortcode");
 
         // Output original shortcode final content
-        echo do_shortcode( "[$shortcode " . implode( ' ', $atts_ori ) . " ]" );
+        echo do_shortcode("[$shortcode " . implode(' ', $atts_ori) . " ]");
     }
 
@@ -881 +922 @@
      * @access public
      */
-    public function register_comment_form_actions( $defaults ) {
+    public function register_comment_form_actions($defaults)
+    {
         $this->esi_args = $defaults;
         echo GUI::clean_wrapper_begin();
-        add_filter( 'comment_form_submit_button', array( $this, 'sub_comment_form_btn' ), 1000, 2 ); // To save the params passed in
-        add_action( 'comment_form', array( $this, 'sub_comment_form_block' ), 1000 );
+        add_filter('comment_form_submit_button', array($this, 'sub_comment_form_btn'), 1000, 2); // To save the params passed in
+        add_action('comment_form', array($this, 'sub_comment_form_block'), 1000);
         return $defaults;
     }
@@ -895 +937 @@
      * @access public
      */
-    public function sub_comment_form_btn( $unused, $args ) {
-        if ( empty( $args ) || empty( $this->esi_args ) ) {
-            Debug2::debug( 'comment form args empty?' );
+    public function sub_comment_form_btn($unused, $args)
+    {
+        if (empty($args) || empty($this->esi_args)) {
+            Debug2::debug('comment form args empty?');
             return $unused;
         }
@@ -903 +946 @@
 
         // compare current args with default ones
-        foreach ( $args as $k => $v ) {
-            if ( ! isset( $this->esi_args[ $k ] ) ) {
-                $esi_args[ $k ] = $v;
-            }
-            elseif ( is_array( $v ) ) {
-                $diff = array_diff_assoc( $v, $this->esi_args[ $k ] );
-                if ( ! empty( $diff ) ) {
-                    $esi_args[ $k ] = $diff;
+        foreach ($args as $k => $v) {
+            if (!isset($this->esi_args[$k])) {
+                $esi_args[$k] = $v;
+            } elseif (is_array($v)) {
+                $diff = array_diff_assoc($v, $this->esi_args[$k]);
+                if (!empty($diff)) {
+                    $esi_args[$k] = $diff;
                 }
-            }
-            elseif ( $v !== $this->esi_args[ $k ] ) {
-                $esi_args[ $k ] = $v;
+            } elseif ($v !== $this->esi_args[$k]) {
+                $esi_args[$k] = $v;
             }
         }
@@ -931 +972 @@
      * @since 1.1.3
      */
-    public function sub_comment_form_block( $post_id ) {
+    public function sub_comment_form_block($post_id)
+    {
         echo GUI::clean_wrapper_end();
         $params = array(
@@ -938 +980 @@
         );
 
-        echo $this->sub_esi_block( 'comment-form', 'comment form', $params );
+        echo $this->sub_esi_block('comment-form', 'comment form', $params);
         echo GUI::clean_wrapper_begin();
-        add_action( 'comment_form_after', array( $this, 'comment_form_sub_clean' ) );
+        add_action('comment_form_after', array($this, 'comment_form_sub_clean'));
     }
 
@@ -950 +992 @@
      * @access public
      */
-    public function comment_form_sub_clean() {
+    public function comment_form_sub_clean()
+    {
         echo GUI::clean_wrapper_end();
     }
@@ -960 +1003 @@
      * @access public
      */
-    public function finalize( $buffer ) {
+    public function finalize($buffer)
+    {
         // Prepend combo esi block
-        if ( self::$_combine_ids ) {
-            Debug2::debug( '[ESI] 🍔 Enabled combo' );
-            $esi_block = $this->sub_esi_block( self::COMBO, '__COMBINE_MAIN__', array(), 'no-cache', true );
+        if (self::$_combine_ids) {
+            Debug2::debug('[ESI] 🍔 Enabled combo');
+            $esi_block = $this->sub_esi_block(self::COMBO, '__COMBINE_MAIN__', array(), 'no-cache', true);
             $buffer = $esi_block . $buffer;
         }
 
         // Bypass if no preserved list to be replaced
-        if ( ! $this->_esi_preserve_list ) {
+        if (!$this->_esi_preserve_list) {
             return $buffer;
         }
 
-        $keys = array_keys( $this->_esi_preserve_list );
-
-        Debug2::debug( '[ESI] replacing preserved blocks', $keys );
-
-        $buffer = str_replace( $keys, $this->_esi_preserve_list, $buffer );
+        $keys = array_keys($this->_esi_preserve_list);
+
+        Debug2::debug('[ESI] replacing preserved blocks', $keys);
+
+        $buffer = str_replace($keys, $this->_esi_preserve_list, $buffer);
 
         return $buffer;
@@ -987 +1031 @@
      * @since  3.3
      */
-    public function contain_preserve_esi( $content ) {
+    public function contain_preserve_esi($content)
+    {
         $hit_list = array();
-        foreach ( $this->_esi_preserve_list as $k => $v ) {
-            if ( strpos( $content, '"' . $k . '"' ) !== false ) {
+        foreach ($this->_esi_preserve_list as $k => $v) {
+            if (strpos($content, '"' . $k . '"') !== false) {
                 $hit_list[] = '"' . $k . '"';
             }
-            if ( strpos( $content, "'" . $k . "'" ) !== false ) {
+            if (strpos($content, "'" . $k . "'") !== false) {
                 $hit_list[] = "'" . $k . "'";
             }
@@ -999 +1044 @@
         return $hit_list;
     }
-
 }

litespeed-cache/trunk/src/htaccess.cls.php

@@ -559 +559 @@
                 $vary_cookies[] = ',wp-postpass_' . COOKIEHASH;
             }
-            $vary_cookies = apply_filters('litespeed_vary_cookies', $vary_cookies); // todo: test if response vary header can work in latest OLS, drop the above two lines
-        }
+        }
+        $vary_cookies = apply_filters('litespeed_vary_cookies', $vary_cookies); // todo: test if response vary header can work in latest OLS, drop the above two lines
         // frontend and backend
         if ($vary_cookies) {
             $env = 'Cache-Vary:' . implode(',', $vary_cookies);
-            if (LITESPEED_SERVER_TYPE === 'LITESPEED_SERVER_OLS') {
-                $env = '"' . $env . '"';
-            }
+            // if (LITESPEED_SERVER_TYPE === 'LITESPEED_SERVER_OLS') {
+            // }
+            $env = '"' . $env . '"';
             $new_rules[] = $new_rules_backend[] = self::MARKER_LOGIN_COOKIE . self::MARKER_START;
             $new_rules[] = $new_rules_backend[] = 'RewriteRule .? - [E=' . $env . ']';
@@ -594 +594 @@
         // webp support
         $id = Base::O_IMG_OPTM_WEBP;
-        if (!empty($cfg[$id]) || !empty($cfg[Base::O_GUEST])) {
+        if (!empty($cfg[$id]) || (!empty($cfg[Base::O_GUEST]) && !empty($cfg[Base::O_GUEST_OPTM]))) {
             $new_rules[] = self::MARKER_WEBP . self::MARKER_START;
             $new_rules[] = 'RewriteCond %{HTTP_ACCEPT} "image/webp"';

litespeed-cache/trunk/src/img-optm.cls.php

@@ -1191 +1191 @@
         $to_be_continued = $wpdb->get_row($wpdb->prepare($img_q, array($offset * $limit, 1)));
         if ($to_be_continued) {
-            return Router::self_redirect(Router::ACTION_IMG_OPTM, self::TYPE_DESTROY);
+            # Check if post_id is beyond next_post_id
+            self::debug('[next_post_id] ' . $this->_summary['next_post_id'] . ' [cursor post id] ' . $to_be_continued->post_id);
+            if ($to_be_continued->post_id <= $this->_summary['next_post_id']) {
+                self::debug('redirecting to next');
+                return Router::self_redirect(Router::ACTION_IMG_OPTM, self::TYPE_DESTROY);
+            }
+            self::debug('🎊 Finished destroying');
         }
 
@@ -1220 +1226 @@
             $short_file_path = $this->tmp_path . $short_file_path;
         }
+        self::debug('deleting ' . $short_file_path);
 
         // del webp
@@ -1232 +1239 @@
         // del optimized ori
         if ($this->__media->info($bk_file, $this->tmp_pid)) {
+            self::debug('deleting optim ori');
             $this->__media->del($short_file_path, $this->tmp_pid);
             $this->__media->rename($bk_file, $short_file_path, $this->tmp_pid);

litespeed-cache/trunk/src/lang.cls.php

@@ -156 +156 @@
             self::O_OPTM_DNS_PREFETCH           => __('DNS Prefetch', 'litespeed-cache'),
             self::O_OPTM_DNS_PREFETCH_CTRL      => __('DNS Prefetch Control', 'litespeed-cache'),
+            self::O_OPTM_DNS_PRECONNECT         => __('DNS Preconnect', 'litespeed-cache'),
             self::O_OPTM_CSS_EXC                => __('CSS Excludes', 'litespeed-cache'),
             self::O_OPTM_JS_DELAY_INC           => __('JS Delayed Includes', 'litespeed-cache'),

litespeed-cache/trunk/src/media.cls.php

@@ -645 +645 @@
             // Add missing dimensions
             if (defined('LITESPEED_GUEST_OPTM') || $this->conf(Base::O_MEDIA_ADD_MISSING_SIZES)) {
-                if (empty($attrs['width']) || $attrs['width'] == 'auto' || empty($attrs['height']) || $attrs['height'] == 'auto') {
+                if (!apply_filters('litespeed_media_add_missing_sizes', true)) {
+                    Debug2::debug2('[Media] add_missing_sizes bypassed via litespeed_media_add_missing_sizes filter');
+                } elseif (empty($attrs['width']) || $attrs['width'] == 'auto' || empty($attrs['height']) || $attrs['height'] == 'auto') {
                     self::debug('⚠️ Missing sizes for image [src] ' . $attrs['src']);
                     $dimensions = $this->_detect_dimensions($attrs['src']);

litespeed-cache/trunk/src/optimize.cls.php

@@ -35 +35 @@
 
     private $dns_prefetch;
+    private $dns_preconnect;
     private $_ggfonts_urls = array();
     private $_ccss;
@@ -128 +129 @@
          */
         $this->_dns_prefetch_init();
+
+        /**
+         * Preconnect
+         * @since 5.6.1
+         */
+        $this->_dns_preconnect_init();
 
         add_filter('litespeed_buffer_finalize', array($this, 'finalize'), 20);
@@ -659 +666 @@
 
     /**
+     * Preconnect init
+     *
+     * @since 5.6.1
+     */
+    private function _dns_preconnect_init()
+    {
+
+        $this->dns_preconnect = $this->conf(self::O_OPTM_DNS_PRECONNECT);
+        if ($this->dns_preconnect) {
+            add_action('litespeed_optm', array($this, 'dns_preconnect_output'));
+        }
+    }
+
+    /**
      * Prefetch DNS hook for WP
      *
@@ -690 +711 @@
             if ($v) {
                 $this->html_head .= '<link rel="dns-prefetch" href="' . $v . '" />';
+            }
+        }
+    }
+
+    /**
+     * Preconnect
+     *
+     * @since 5.6.1
+     * @access public
+     */
+    public function dns_preconnect_output()
+    {
+        foreach ($this->dns_preconnect as $v) {
+            if ($v) {
+                $this->html_head .= '<link rel="preconnect" href="' . $v . '" />';
             }
         }
@@ -823 +859 @@
 
         $combine_ext_inl = $this->conf(self::O_OPTM_JS_COMB_EXT_INL);
+        if (!apply_filters('litespeed_optm_js_comb_ext_inl', true)) {
+            Debug2::debug2('[Optm] js_comb_ext_inl bypassed via litespeed_optm_js_comb_ext_inl filter');
+            $combine_ext_inl = false;
+        }
 
         $src_list = array();
@@ -996 +1036 @@
 
         $combine_ext_inl = $this->conf(self::O_OPTM_CSS_COMB_EXT_INL);
+        if (!apply_filters('litespeed_optm_css_comb_ext_inl', true)) {
+            Debug2::debug2('[Optm] css_comb_ext_inl bypassed via litespeed_optm_css_comb_ext_inl filter');
+            $combine_ext_inl = false;
+        }
 
         $css_to_be_removed = apply_filters('litespeed_optm_css_to_be_removed', array());

litespeed-cache/trunk/thirdparty/litespeed-check.cls.php

@@ -1 +1 @@
 <?php
+
 /**
  * Check if any plugins that could conflict with LiteSpeed Cache are active.
@@ -7 +8 @@
 namespace LiteSpeed\Thirdparty;
 
-defined( 'WPINC' ) || exit;
+defined('WPINC') || exit;
 
-class LiteSpeed_Check {
+class LiteSpeed_Check
+{
 
     public static $_incompatible_plugins =
-        array(
-            // 'autoptimize/autoptimize.php',
-            'breeze/breeze.php',
-            'cache-enabler/cache-enabler.php',
-            'cachify/cachify.php',
-            'cloudflare/cloudflare.php',
-            'comet-cache/comet-cache.php',
-            'docket-cache/docket-cache.php',
-            'fast-velocity-minify/fvm.php',
-            'hummingbird-performance/wp-hummingbird.php',
-            'nginx-cache/nginx-cache.php',
-            'nitropack/main.php',
-            'pantheon-advanced-page-cache/pantheon-advanced-page-cache.php',
-            'powered-cache/powered-cache.php',
-            'sg-cachepress/sg-cachepress.php',
-            'simple-cache/simple-cache.php',
-            // 'redis-cache/redis-cache.php',
-            'w3-total-cache/w3-total-cache.php',
-            'wp-cloudflare-page-cache/wp-cloudflare-page-cache.php',
-            'wp-fastest-cache/wpFastestCache.php',
-            'wp-meteor/wp-meteor.php',
-            'wp-optimize/wp-optimize.php',
-            'wp-performance-score-booster/wp-performance-score-booster.php',
-            'wp-rocket/wp-rocket.php',
-            'wp-super-cache/wp-cache.php',
-        );
+    array(
+        // 'autoptimize/autoptimize.php',
+        'breeze/breeze.php',
+        'cache-enabler/cache-enabler.php',
+        'cachify/cachify.php',
+        'cloudflare/cloudflare.php',
+        'comet-cache/comet-cache.php',
+        'docket-cache/docket-cache.php',
+        'fast-velocity-minify/fvm.php',
+        'hummingbird-performance/wp-hummingbird.php',
+        'nginx-cache/nginx-cache.php',
+        'nitropack/main.php',
+        'pantheon-advanced-page-cache/pantheon-advanced-page-cache.php',
+        'powered-cache/powered-cache.php',
+        'psn-pagespeed-ninja/pagespeedninja.php',
+        'sg-cachepress/sg-cachepress.php',
+        'simple-cache/simple-cache.php',
+        // 'redis-cache/redis-cache.php',
+        'w3-total-cache/w3-total-cache.php',
+        'wp-cloudflare-page-cache/wp-cloudflare-page-cache.php',
+        'wp-fastest-cache/wpFastestCache.php',
+        'wp-meteor/wp-meteor.php',
+        'wp-optimize/wp-optimize.php',
+        'wp-performance-score-booster/wp-performance-score-booster.php',
+        'wp-rocket/wp-rocket.php',
+        'wp-super-cache/wp-cache.php',
+    );
 
     private static $_option = 'thirdparty_litespeed_check';
     private static $_msg_id = 'id="lscwp-incompatible-plugin-notice"';
 
-    public static function detect() {
-        if ( ! is_admin() ) {
+    public static function detect()
+    {
+        if (!is_admin()) {
             return;
         }
@@ -50 +54 @@
          * Check for incompatible plugins when `litespeed-cache` is first activated.
          */
-        $plugin = basename( LSCWP_DIR ) . '/litespeed-cache.php';
-        register_deactivation_hook( $plugin, function( $_network_wide ) {
-            \LiteSpeed\Admin_Display::delete_option( self::$_option );
-        } );
-        if ( ! \LiteSpeed\Admin_Display::get_option( self::$_option ) ) {
-            self::activated_plugin( $plugin, null );
-            \LiteSpeed\Admin_Display::add_option( self::$_option, true );
+        $plugin = basename(LSCWP_DIR) . '/litespeed-cache.php';
+        register_deactivation_hook($plugin, function ($_network_wide) {
+            \LiteSpeed\Admin_Display::delete_option(self::$_option);
+        });
+        if (!\LiteSpeed\Admin_Display::get_option(self::$_option)) {
+            self::activated_plugin($plugin, null);
+            \LiteSpeed\Admin_Display::add_option(self::$_option, true);
         }
 
@@ -62 +66 @@
          * Check for incompatible plugins when any plugin is (de)activated.
          */
-        add_action( 'activated_plugin', __CLASS__ . '::activated_plugin', 10, 2 );
-        add_action( 'deactivated_plugin', __CLASS__ . '::deactivated_plugin', 10, 2 );
+        add_action('activated_plugin', __CLASS__ . '::activated_plugin', 10, 2);
+        add_action('deactivated_plugin', __CLASS__ . '::deactivated_plugin', 10, 2);
+
+        if (class_exists('PagespeedNinja')) {
+            \LiteSpeed\Admin_Display::error(
+                '<div ' . self::$_msg_id . '>'
+                    . esc_html__(
+                        'Please consider disabling the following detected plugins, as they may conflict with LiteSpeed Cache:',
+                        'litespeed-cache'
+                    )
+                    . '<p style="color: red; font-weight: 700;">'
+                    . 'PageSpeed Ninja'
+                    . '</p>'
+                    . '</div>',
+                false,
+                true
+            );
+        }
     }
 
-    public static function activated_plugin( $plugin, $network_wide ) {
-        self::incompatible_plugin_notice( $plugin, $network_wide, 'activated' );
+    public static function activated_plugin($plugin, $network_wide)
+    {
+        self::incompatible_plugin_notice($plugin, $network_wide, 'activated');
     }
 
-    public static function deactivated_plugin( $plugin, $network_wide ) {
-        self::incompatible_plugin_notice( $plugin, $network_wide, 'deactivated' );
+    public static function deactivated_plugin($plugin, $network_wide)
+    {
+        self::incompatible_plugin_notice($plugin, $network_wide, 'deactivated');
     }
 
@@ -78 +100 @@
      * Show a notification if there are any.
      */
-    public static function incompatible_plugin_notice( $plugin, $_network_wide, $action ) {
+    public static function incompatible_plugin_notice($plugin, $_network_wide, $action)
+    {
         self::update_messages();
 
@@ -86 +109 @@
          * remove `$plugin` from the list.
          */
-        $deactivated = 'deactivated' === $action ? array( $plugin ) : array();
+        $deactivated = 'deactivated' === $action ? array($plugin) : array();
 
         $incompatible_plugins =
             array_map(
-                function( $plugin ) { return WP_PLUGIN_DIR . '/' . $plugin; },
-                array_diff( self::$_incompatible_plugins, $deactivated )
+                function ($plugin) {
+                    return WP_PLUGIN_DIR . '/' . $plugin;
+                },
+                array_diff(self::$_incompatible_plugins, $deactivated)
             );
 
         $active_incompatible_plugins =
             array_map(
-                function( $plugin ) {
-                    $plugin = get_plugin_data( $plugin, false, true );
+                function ($plugin) {
+                    $plugin = get_plugin_data($plugin, false, true);
                     return $plugin['Name'];
                 },
-                array_intersect( $incompatible_plugins, wp_get_active_and_valid_plugins() )
+                array_intersect($incompatible_plugins, wp_get_active_and_valid_plugins())
             );
 
-        if ( empty( $active_incompatible_plugins ) ) {
+        if (empty($active_incompatible_plugins)) {
             return;
         }
@@ -109 +134 @@
         \LiteSpeed\Admin_Display::error(
             '<div ' . self::$_msg_id . '>'
-            . esc_html__(
-                'Please consider disabling the following detected plugins, as they may conflict with LiteSpeed Cache:',
-                'litespeed-cache'
-            )
-            . '<p style="color: red; font-weight: 700;">'
-            . implode( ', ', $active_incompatible_plugins )
-            . '</p>'
-            . '</div>',
+                . esc_html__(
+                    'Please consider disabling the following detected plugins, as they may conflict with LiteSpeed Cache:',
+                    'litespeed-cache'
+                )
+                . '<p style="color: red; font-weight: 700;">'
+                . implode(', ', $active_incompatible_plugins)
+                . '</p>'
+                . '</div>',
             false,
             true
@@ -127 +152 @@
      * notice(s).
      */
-    private static function update_messages() {
+    private static function update_messages()
+    {
         $messages =
             \LiteSpeed\Admin_Display::get_option(
@@ -133 +159 @@
                 array()
             );
-        if ( is_array( $messages ) ) {
-            foreach ( $messages as $index => $message ) {
-                if ( strpos( $message, self::$_msg_id ) !== false ) {
-                    unset( $messages[ $index ] );
-                    if ( ! $messages ) {
+        if (is_array($messages)) {
+            foreach ($messages as $index => $message) {
+                if (strpos($message, self::$_msg_id) !== false) {
+                    unset($messages[$index]);
+                    if (!$messages) {
                         $messages = -1;
                     }

litespeed-cache/trunk/thirdparty/woocommerce.cls.php

@@ -1 +1 @@
 <?php
+
 /**
  * The Third Party integration with the WooCommerce plugin.
@@ -9 +10 @@
  * @author        LiteSpeed Technologies <[email protected]>
  */
+
 namespace LiteSpeed\Thirdparty;
 
-defined( 'WPINC' ) || exit;
+defined('WPINC') || exit;
 
 use \LiteSpeed\API;
 use \LiteSpeed\Base;
 
-class WooCommerce extends Base {
+class WooCommerce extends Base
+{
     const O_CACHE_TTL_FRONTPAGE = Base::O_CACHE_TTL_FRONTPAGE;
 
-    const CACHETAG_SHOP = 'WC_S' ;
-    const CACHETAG_TERM = 'WC_T.' ;
-    const O_UPDATE_INTERVAL = 'wc_update_interval' ;
-    const O_PQS_CS = 0 ; // flush product on quantity + stock change, categories on stock change
-    const O_PS_CS = 1 ; // flush product and categories on stock change
-    const O_PS_CN = 2 ; // flush product on stock change, categories no flush
-    const O_PQS_CQS = 3 ; // flush product and categories on quantity + stock change
-
-    const ESI_PARAM_ARGS = 'wc_args' ;
-    const ESI_PARAM_POSTID = 'wc_post_id' ;
-    const ESI_PARAM_NAME = 'wc_name' ;
-    const ESI_PARAM_PATH = 'wc_path' ;
-    const ESI_PARAM_LOCATED = 'wc_located' ;
-
-    private $esi_enabled ;
+    const CACHETAG_SHOP = 'WC_S';
+    const CACHETAG_TERM = 'WC_T.';
+    const O_UPDATE_INTERVAL = 'wc_update_interval';
+    const O_CART_VARY = 'wc_cart_vary';
+    const O_PQS_CS = 0; // flush product on quantity + stock change, categories on stock change
+    const O_PS_CS = 1; // flush product and categories on stock change
+    const O_PS_CN = 2; // flush product on stock change, categories no flush
+    const O_PQS_CQS = 3; // flush product and categories on quantity + stock change
+
+    const ESI_PARAM_ARGS = 'wc_args';
+    const ESI_PARAM_POSTID = 'wc_post_id';
+    const ESI_PARAM_NAME = 'wc_name';
+    const ESI_PARAM_PATH = 'wc_path';
+    const ESI_PARAM_LOCATED = 'wc_located';
+
+    private $esi_enabled;
 
     /**
@@ -43 +47 @@
     public static function detect()
     {
-        if ( ! defined( 'WOOCOMMERCE_VERSION' ) ) {
-            return ;
-        }
-
-        self::cls()->add_hooks() ;
-
+        if (!defined('WOOCOMMERCE_VERSION')) {
+            return;
+        }
+
+        self::cls()->add_hooks();
     }
 
@@ -59 +62 @@
     public function add_hooks()
     {
-        $this->_option_append() ;
-
-        $this->esi_enabled = apply_filters( 'litespeed_esi_status', false );
-
-        add_action( 'litespeed_control_finalize', array( $this, 'set_control' ) );
-        add_action( 'litespeed_tag_finalize', array( $this, 'set_tag' ) );
+        $this->_option_append();
+
+        $this->esi_enabled = apply_filters('litespeed_esi_status', false);
+
+        add_action('litespeed_control_finalize', array($this, 'set_control'));
+        add_action('litespeed_tag_finalize', array($this, 'set_tag'));
 
         // Purging a product on stock change should only occur during product purchase. This function will add the purging callback when an order is complete.
-        add_action( 'woocommerce_product_set_stock', array( $this, 'purge_product' ) ) ;
-        add_action( 'woocommerce_variation_set_stock', array( $this, 'purge_product' ) ) ; // #984479 Update variations stock
-
-        add_action( 'comment_post', array( $this, 'add_review' ), 10, 3 ) ;
-
-        if ( $this->esi_enabled ) {
-            if ( function_exists( 'is_shop' ) && ! is_shop() ) {
-                add_action( 'litespeed_tpl_normal', array( $this, 'set_block_template' ) );
+        add_action('woocommerce_product_set_stock', array($this, 'purge_product'));
+        add_action('woocommerce_variation_set_stock', array($this, 'purge_product')); // #984479 Update variations stock
+
+        add_action('comment_post', array($this, 'add_review'), 10, 3);
+
+        if ($this->esi_enabled) {
+            if (function_exists('is_shop') && !is_shop()) {
+                add_action('litespeed_tpl_normal', array($this, 'set_block_template'));
                 // No need for add-to-cart button
                 // add_action( 'litespeed_esi_load-wc-add-to-cart-form', array( $this, 'load_add_to_cart_form_block' ) ) ;
 
-                add_action( 'litespeed_esi_load-storefront-cart-header', array( $this, 'load_cart_header' ) );
-                add_action( 'litespeed_esi_load-widget', array( $this, 'register_post_view' ) );
-            }
-
-            if ( function_exists( 'is_product' ) && is_product() ) {
-                add_filter( 'litespeed_esi_params', array( $this, 'add_post_id' ), 10, 2 );
-            }
-
-        }
-
-        if ( is_admin() ) {
-            add_action('litespeed_api_purge_post', array( $this, 'backend_purge' ) ) ;//todo
-            add_action( 'delete_term_relationships', array( $this, 'delete_rel' ), 10, 2 ) ;
-            add_action( 'litespeed_settings_tab', array( $this, 'settings_add_tab' ) );
-            add_action( 'litespeed_settings_content', array( $this, 'settings_add_content' ) );
-            add_filter( 'litespeed_widget_default_options', array( $this, 'wc_widget_default' ), 10, 2 );
-        }
-
+                add_action('litespeed_esi_load-storefront-cart-header', array($this, 'load_cart_header'));
+                add_action('litespeed_esi_load-widget', array($this, 'register_post_view'));
+            }
+
+            if (function_exists('is_product') && is_product()) {
+                add_filter('litespeed_esi_params', array($this, 'add_post_id'), 10, 2);
+            }
+        }
+
+        if (is_admin()) {
+            add_action('litespeed_api_purge_post', array($this, 'backend_purge')); //todo
+            add_action('delete_term_relationships', array($this, 'delete_rel'), 10, 2);
+            add_action('litespeed_settings_tab', array($this, 'settings_add_tab'));
+            add_action('litespeed_settings_content', array($this, 'settings_add_content'));
+            add_filter('litespeed_widget_default_options', array($this, 'wc_widget_default'), 10, 2);
+        }
+
+        if (apply_filters('litespeed_conf', self::O_CART_VARY)) {
+            add_filter('litespeed_vary_cookies', function ($list) {
+                $list[] = 'woocommerce_cart_hash';
+                return array_unique($list);
+            });
+        }
     }
 
@@ -106 +114 @@
     public function purge_esi()
     {
-        do_action( 'litespeed_debug', '3rd woo purge ESI in action: ' . current_filter() ) ;
-        do_action( 'litespeed_purge_private_esi', 'storefront-cart-header' );
-
+        do_action('litespeed_debug', '3rd woo purge ESI in action: ' . current_filter());
+        do_action('litespeed_purge_private_esi', 'storefront-cart-header');
     }
 
@@ -119 +126 @@
     public function purge_private_all()
     {
-        do_action( 'litespeed_purge_private_all' );
+        do_action('litespeed_purge_private_all');
     }
 
@@ -128 +135 @@
      * @access public
      */
-    public function check_if_need_esi( $template )
-    {
-        if (  $this->vary_needed() ) {
-            do_action( 'litespeed_debug', 'API: 3rd woo added ESI' );
-            add_action( 'litespeed_tpl_normal', array( $this, 'set_swap_header_cart' ) );
+    public function check_if_need_esi($template)
+    {
+        if ($this->vary_needed()) {
+            do_action('litespeed_debug', 'API: 3rd woo added ESI');
+            add_action('litespeed_tpl_normal', array($this, 'set_swap_header_cart'));
         }
 
         return $template;
-
     }
 
@@ -145 +151 @@
      * @access public
      */
-    public function vary_maintain( $vary ) {
-        if ( $this->vary_needed() ) {
-            do_action( 'litespeed_debug', 'API: 3rd woo added vary due to cart not empty' );
-            $vary[ 'woo_cart' ] = 1;
+    public function vary_maintain($vary)
+    {
+        if ($this->vary_needed()) {
+            do_action('litespeed_debug', 'API: 3rd woo added vary due to cart not empty');
+            $vary['woo_cart'] = 1;
         }
 
@@ -162 +169 @@
     private function vary_needed()
     {
-        if ( ! function_exists( 'WC' ) ) {
-            return false ;
-        }
-
-        $woocom = WC() ;
-        if ( ! $woocom ) {
-            return false ;
-        }
-
-        if ( is_null( $woocom->cart ) ) {
-            return false ;
-        }
-        return $woocom->cart->get_cart_contents_count() > 0 ;
+        if (!function_exists('WC')) {
+            return false;
+        }
+
+        $woocom = WC();
+        if (!$woocom) {
+            return false;
+        }
+
+        if (is_null($woocom->cart)) {
+            return false;
+        }
+        return $woocom->cart->get_cart_contents_count() > 0;
     }
 
@@ -186 +193 @@
     public function set_block_template()
     {
-        add_action('woocommerce_before_template_part', array( $this, 'block_template' ), 999, 4) ;
+        add_action('woocommerce_before_template_part', array($this, 'block_template'), 999, 4);
     }
 
@@ -202 +209 @@
     public function set_swap_header_cart()
     {
-        $priority = has_action('storefront_header', 'storefront_header_cart') ;
-        if ( $priority !== false ) {
-            remove_action('storefront_header', 'storefront_header_cart', $priority) ;
-            add_action('storefront_header', array( $this, 'esi_cart_header' ), $priority) ;
+        $priority = has_action('storefront_header', 'storefront_header_cart');
+        if ($priority !== false) {
+            remove_action('storefront_header', 'storefront_header_cart', $priority);
+            add_action('storefront_header', array($this, 'esi_cart_header'), $priority);
         }
     }
@@ -220 +227 @@
     public function block_template($template_name, $template_path, $located, $args)
     {
-        if ( strpos($template_name, 'add-to-cart') === false ) {
-            if ( strpos($template_name, 'related.php') !== false ) {
-                remove_action('woocommerce_before_template_part', array( $this, 'block_template' ), 999) ;
-                add_filter('woocommerce_related_products_args', array( $this, 'add_related_tags' ) ) ;
-                add_action('woocommerce_after_template_part', array( $this, 'end_template' ), 999) ;
-            }
-            return ;
-        }
-        return ;
-
-
-
-
-                            // todo: wny not use?
-
-        global $post ;
+        if (strpos($template_name, 'add-to-cart') === false) {
+            if (strpos($template_name, 'related.php') !== false) {
+                remove_action('woocommerce_before_template_part', array($this, 'block_template'), 999);
+                add_filter('woocommerce_related_products_args', array($this, 'add_related_tags'));
+                add_action('woocommerce_after_template_part', array($this, 'end_template'), 999);
+            }
+            return;
+        }
+        return;
+
+
+
+
+        // todo: wny not use?
+
+        global $post;
         $params = array(
             self::ESI_PARAM_ARGS => $args,
@@ -242 +249 @@
             self::ESI_PARAM_PATH => $template_path,
             self::ESI_PARAM_LOCATED => $located
-        ) ;
-        add_action('woocommerce_after_add_to_cart_form', array( $this, 'end_form' ) ) ;
-        add_action('woocommerce_after_template_part', array( $this, 'end_form' ), 999) ;
-        echo apply_filters( 'litespeed_esi_url', 'wc-add-to-cart-form', 'WC_CART_FORM', $params );
-        echo apply_filters( 'litespeed_clean_wrapper_begin', '' );
+        );
+        add_action('woocommerce_after_add_to_cart_form', array($this, 'end_form'));
+        add_action('woocommerce_after_template_part', array($this, 'end_form'), 999);
+        echo apply_filters('litespeed_esi_url', 'wc-add-to-cart-form', 'WC_CART_FORM', $params);
+        echo apply_filters('litespeed_clean_wrapper_begin', '');
     }
 
@@ -260 +267 @@
     public function end_form($template_name = '')
     {
-        if ( ! empty($template_name) && strpos($template_name, 'add-to-cart') === false ) {
-            return ;
-        }
-        echo apply_filters( 'litespeed_clean_wrapper_end', '' );
-        remove_action('woocommerce_after_add_to_cart_form', array( $this, 'end_form' ) ) ;
-        remove_action('woocommerce_after_template_part', array( $this, 'end_form' ), 999) ;
+        if (!empty($template_name) && strpos($template_name, 'add-to-cart') === false) {
+            return;
+        }
+        echo apply_filters('litespeed_clean_wrapper_end', '');
+        remove_action('woocommerce_after_add_to_cart_form', array($this, 'end_form'));
+        remove_action('woocommerce_after_template_part', array($this, 'end_form'), 999);
     }
 
@@ -281 +288 @@
     public function add_related_tags($args)
     {
-        if ( empty($args) || ! isset($args['post__in']) ) {
-            return $args ;
-        }
-        $related_posts = $args['post__in'] ;
-        foreach ( $related_posts as $related ) {
-            do_action( 'litespeed_tag_add_post', $related );
-        }
-        return $args ;
+        if (empty($args) || !isset($args['post__in'])) {
+            return $args;
+        }
+        $related_posts = $args['post__in'];
+        foreach ($related_posts as $related) {
+            do_action('litespeed_tag_add_post', $related);
+        }
+        return $args;
     }
 
@@ -302 +309 @@
     public function end_template($template_name)
     {
-        if ( strpos($template_name, 'related.php') !== false ) {
-            remove_action('woocommerce_after_template_part', array( $this, 'end_template' ), 999) ;
-            $this->set_block_template() ;
+        if (strpos($template_name, 'related.php') !== false) {
+            remove_action('woocommerce_after_template_part', array($this, 'end_template'), 999);
+            $this->set_block_template();
         }
     }
@@ -318 +325 @@
     public function esi_cart_header()
     {
-        echo apply_filters( 'litespeed_esi_url', 'storefront-cart-header', 'STOREFRONT_CART_HEADER' );
+        echo apply_filters('litespeed_esi_url', 'storefront-cart-header', 'STOREFRONT_CART_HEADER');
     }
 
@@ -348 +355 @@
     public function load_add_to_cart_form_block($params)
     {
-        global $post, $wp_query ;
-        $post = get_post($params[self::ESI_PARAM_POSTID]) ;
-        $wp_query->setup_postdata($post) ;
-        function_exists( 'wc_get_template' ) && wc_get_template($params[self::ESI_PARAM_NAME], $params[self::ESI_PARAM_ARGS], $params[self::ESI_PARAM_PATH]) ;
+        global $post, $wp_query;
+        $post = get_post($params[self::ESI_PARAM_POSTID]);
+        $wp_query->setup_postdata($post);
+        function_exists('wc_get_template') && wc_get_template($params[self::ESI_PARAM_NAME], $params[self::ESI_PARAM_ARGS], $params[self::ESI_PARAM_PATH]);
     }
 
@@ -367 +374 @@
     public function register_post_view($params)
     {
-        if ( $params[API::PARAM_NAME] !== 'WC_Widget_Recently_Viewed' ) {
-            return ;
-        }
-        if ( ! isset($params[self::ESI_PARAM_POSTID]) ) {
-            return ;
-        }
-        $id = $params[self::ESI_PARAM_POSTID] ;
-        $esi_post = get_post($id) ;
-        $product = function_exists( 'wc_get_product' ) ? wc_get_product($esi_post) : false ;
-
-        if ( empty($product) ) {
-            return ;
-        }
-
-        global $post ;
-        $post = $esi_post ;
-        function_exists( 'wc_track_product_view' ) && wc_track_product_view() ;
+        if ($params[API::PARAM_NAME] !== 'WC_Widget_Recently_Viewed') {
+            return;
+        }
+        if (!isset($params[self::ESI_PARAM_POSTID])) {
+            return;
+        }
+        $id = $params[self::ESI_PARAM_POSTID];
+        $esi_post = get_post($id);
+        $product = function_exists('wc_get_product') ? wc_get_product($esi_post) : false;
+
+        if (empty($product)) {
+            return;
+        }
+
+        global $post;
+        $post = $esi_post;
+        function_exists('wc_track_product_view') && wc_track_product_view();
     }
 
@@ -394 +401 @@
      * @access public
      */
-    public function add_post_id( $params, $block_id )
-    {
-        if ( $block_id == 'widget' ) {
-            if ( $params[ API::PARAM_NAME ] == 'WC_Widget_Recently_Viewed' ) {
-                $params[ self::ESI_PARAM_POSTID ] = get_the_ID();
+    public function add_post_id($params, $block_id)
+    {
+        if ($block_id == 'widget') {
+            if ($params[API::PARAM_NAME] == 'WC_Widget_Recently_Viewed') {
+                $params[self::ESI_PARAM_POSTID] = get_the_ID();
             }
         }
@@ -414 +421 @@
      * @access public
      */
-    public function wc_widget_default( $options, $widget )
-    {
-        if ( ! is_array( $options ) ) {
+    public function wc_widget_default($options, $widget)
+    {
+        if (!is_array($options)) {
             return $options;
         }
-        $widget_name = get_class( $widget ) ;
-        if ( $widget_name === 'WC_Widget_Recently_Viewed' ) {
-            $options[ API::WIDGET_O_ESIENABLE ] = API::VAL_ON2;
-            $options[ API::WIDGET_O_TTL ] = 0;
-        }
-        elseif ( $widget_name === 'WC_Widget_Recent_Reviews' ) {
-            $options[ API::WIDGET_O_ESIENABLE ] = API::VAL_ON;
-            $options[ API::WIDGET_O_TTL ] = 86400;
+        $widget_name = get_class($widget);
+        if ($widget_name === 'WC_Widget_Recently_Viewed') {
+            $options[API::WIDGET_O_ESIENABLE] = API::VAL_ON2;
+            $options[API::WIDGET_O_TTL] = 0;
+        } elseif ($widget_name === 'WC_Widget_Recent_Reviews') {
+            $options[API::WIDGET_O_ESIENABLE] = API::VAL_ON;
+            $options[API::WIDGET_O_TTL] = 86400;
         }
         return $options;
@@ -440 +446 @@
     public function set_tag()
     {
-        $id = get_the_ID() ;
-        if ( $id === false ) {
-            return ;
+        $id = get_the_ID();
+        if ($id === false) {
+            return;
         }
 
         // Check if product has a cache ttl limit or not
-        $sale_from = (int) get_post_meta( $id, '_sale_price_dates_from', true ) ;
-        $sale_to = (int) get_post_meta( $id, '_sale_price_dates_to', true ) ;
-        $now = current_time( 'timestamp' ) ;
-        $ttl = false ;
-        if ( $sale_from && $now < $sale_from ) {
-            $ttl = $sale_from - $now ;
-        }
-        elseif ( $sale_to && $now < $sale_to ) {
-            $ttl = $sale_to - $now ;
-        }
-        if ( $ttl && $ttl < apply_filters( 'litespeed_control_ttl', 0 ) ) {
-            do_action( 'litespeed_control_set_ttl', $ttl, "WooCommerce set scheduled TTL to $ttl" ) ;
-        }
-
-        if ( function_exists( 'is_shop' ) && is_shop() ) {
-            do_action( 'litespeed_tag_add', self::CACHETAG_SHOP );
-        }
-        if ( function_exists( 'is_product_taxonomy' ) && ! is_product_taxonomy() ) {
-            return ;
-        }
-        if ( isset($GLOBALS['product_cat']) && is_string( $GLOBALS['product_cat'] ) ) { // todo: need to check previous woo version to find if its from old woo versions or not!
-            $term = get_term_by('slug', $GLOBALS['product_cat'], 'product_cat') ;
-        }
-        elseif ( isset($GLOBALS['product_tag']) && is_string( $GLOBALS['product_tag'] ) ) {
-            $term = get_term_by('slug', $GLOBALS['product_tag'], 'product_tag') ;
-        }
-        else {
-            $term = false ;
-        }
-
-        if ( $term === false ) {
-            return ;
-        }
-        while ( isset($term) ) {
-            do_action( 'litespeed_tag_add', self::CACHETAG_TERM . $term->term_id );
-            if ( $term->parent == 0 ) {
-                break ;
-            }
-            $term = get_term($term->parent) ;
+        $sale_from = (int) get_post_meta($id, '_sale_price_dates_from', true);
+        $sale_to = (int) get_post_meta($id, '_sale_price_dates_to', true);
+        $now = current_time('timestamp');
+        $ttl = false;
+        if ($sale_from && $now < $sale_from) {
+            $ttl = $sale_from - $now;
+        } elseif ($sale_to && $now < $sale_to) {
+            $ttl = $sale_to - $now;
+        }
+        if ($ttl && $ttl < apply_filters('litespeed_control_ttl', 0)) {
+            do_action('litespeed_control_set_ttl', $ttl, "WooCommerce set scheduled TTL to $ttl");
+        }
+
+        if (function_exists('is_shop') && is_shop()) {
+            do_action('litespeed_tag_add', self::CACHETAG_SHOP);
+        }
+        if (function_exists('is_product_taxonomy') && !is_product_taxonomy()) {
+            return;
+        }
+        if (isset($GLOBALS['product_cat']) && is_string($GLOBALS['product_cat'])) { // todo: need to check previous woo version to find if its from old woo versions or not!
+            $term = get_term_by('slug', $GLOBALS['product_cat'], 'product_cat');
+        } elseif (isset($GLOBALS['product_tag']) && is_string($GLOBALS['product_tag'])) {
+            $term = get_term_by('slug', $GLOBALS['product_tag'], 'product_tag');
+        } else {
+            $term = false;
+        }
+
+        if ($term === false) {
+            return;
+        }
+        while (isset($term)) {
+            do_action('litespeed_tag_add', self::CACHETAG_TERM . $term->term_id);
+            if ($term->parent == 0) {
+                break;
+            }
+            $term = get_term($term->parent);
         }
     }
@@ -494 +497 @@
      * @since 1.6.3 Removed static
      * @access public
-     * @param string $esi_id        The ESI block id if a request is an ESI request.
+     * @param string $esi_id        The ESI block id if a request is an ESI request.
      * @return boolean              True if cacheable, false if not.
      */
     public function set_control($esi_id)
     {
-        if ( ! apply_filters( 'litespeed_control_cacheable', false ) ) {
+        if (!apply_filters('litespeed_control_cacheable', false)) {
             return;
         }
@@ -507 +510 @@
          * @since 1.6.2.1
          */
-        if ( ! function_exists( 'WC' ) ) {
-            return ;
-        }
-
-        $woocom = WC() ;
-        if ( ! $woocom || empty( $woocom->session ) ) {
-            return ;
+        if (!function_exists('WC')) {
+            return;
+        }
+
+        $woocom = WC();
+        if (!$woocom || empty($woocom->session)) {
+            return;
         }
 
         // For later versions, DONOTCACHEPAGE should be set.
         // No need to check uri/qs.
-        if ( version_compare($woocom->version, '1.4.2', '>=') ) {
-            if ( version_compare( $woocom->version, '3.2.0', '<' ) && defined('DONOTCACHEPAGE') && DONOTCACHEPAGE ) {
-                do_action( 'litespeed_control_set_nocache', '3rd party woocommerce not cache by constant' );
-                return ;
-            }
-            elseif ( version_compare($woocom->version, '2.1.0', '>=') ) {
-                $err = false ;
-
-                if ( ! function_exists( 'wc_get_page_id' ) ) {
-                    return ;
+        if (version_compare($woocom->version, '1.4.2', '>=')) {
+            if (version_compare($woocom->version, '3.2.0', '<') && defined('DONOTCACHEPAGE') && DONOTCACHEPAGE) {
+                do_action('litespeed_control_set_nocache', '3rd party woocommerce not cache by constant');
+                return;
+            } elseif (version_compare($woocom->version, '2.1.0', '>=')) {
+                $err = false;
+
+                if (!function_exists('wc_get_page_id')) {
+                    return;
                 }
                 /**
@@ -533 +535 @@
                  * @since  1.4
                  */
-                $page_ids = array_filter( array( wc_get_page_id( 'cart' ), wc_get_page_id( 'checkout' ), wc_get_page_id( 'myaccount' ) ) );
-                if ( isset( $_GET['download_file'] ) || isset( $_GET['add-to-cart'] ) || is_page( $page_ids ) ) {
-                    $err = 'woo non cacheable pages' ;
+                $page_ids = array_filter(array(wc_get_page_id('cart'), wc_get_page_id('checkout'), wc_get_page_id('myaccount')));
+                if (isset($_GET['download_file']) || isset($_GET['add-to-cart']) || is_page($page_ids)) {
+                    $err = 'woo non cacheable pages';
+                } elseif (function_exists('wc_notice_count') && wc_notice_count() > 0) {
+                    $err = 'has wc notice';
                 }
-                elseif ( function_exists( 'wc_notice_count' ) && wc_notice_count() > 0 ) {
-                    $err = 'has wc notice' ;
+
+                if ($err) {
+                    do_action('litespeed_control_set_nocache', '3rd party woocommerce not cache due to ' . $err);
+                    return;
                 }
-
-                if ( $err ) {
-                    do_action( 'litespeed_control_set_nocache', '3rd party woocommerce not cache due to ' . $err );
-                    return ;
-                }
-            }
-            return ;
-        }
-
-        $uri = esc_url($_SERVER["REQUEST_URI"]) ;
-        $uri_len = strlen($uri) ;
-        if ( $uri_len < 5 ) {
-            return ;
-        }
-
-        if ( in_array($uri, array('cart/', 'checkout/', 'my-account/', 'addons/', 'logout/', 'lost-password/', 'product/')) ) { // why contains `product`?
-            do_action( 'litespeed_control_set_nocache', 'uri in cart/account/user pages' );
-            return ;
-        }
-
-        $qs = sanitize_text_field($_SERVER["QUERY_STRING"]) ;
-        $qs_len = strlen($qs) ;
-        if ( ! empty($qs) && $qs_len >= 12 && strpos( $qs, 'add-to-cart=' ) === 0 ) {
-            do_action( 'litespeed_control_set_nocache', 'qs contains add-to-cart' );
-            return ;
+            }
+            return;
+        }
+
+        $uri = esc_url($_SERVER["REQUEST_URI"]);
+        $uri_len = strlen($uri);
+        if ($uri_len < 5) {
+            return;
+        }
+
+        if (in_array($uri, array('cart/', 'checkout/', 'my-account/', 'addons/', 'logout/', 'lost-password/', 'product/'))) { // why contains `product`?
+            do_action('litespeed_control_set_nocache', 'uri in cart/account/user pages');
+            return;
+        }
+
+        $qs = sanitize_text_field($_SERVER["QUERY_STRING"]);
+        $qs_len = strlen($qs);
+        if (!empty($qs) && $qs_len >= 12 && strpos($qs, 'add-to-cart=') === 0) {
+            do_action('litespeed_control_set_nocache', 'qs contains add-to-cart');
+            return;
         }
     }
@@ -576 +577 @@
      * @param WC_Product $product
      */
-    public function purge_product($product) {
-        do_action( 'litespeed_debug', '[3rd] Woo Purge [pid]' . $product->get_id() );
-
-        $config = apply_filters( 'litespeed_conf', self::O_UPDATE_INTERVAL ) ;
-        if ( is_null($config) ) {
-            $config = self::O_PQS_CS ;
-        }
-
-        if ( $config === self::O_PQS_CQS ) {
-            $this->backend_purge($product->get_id()) ;
-        }
-        elseif ( $config !== self::O_PQS_CS && $product->is_in_stock() ) {
-            do_action( 'litespeed_debug', '[3rd] Woo No purge needed [option] ' . $config );
-            return ;
-        }
-        elseif ( $config !== self::O_PS_CN && ! $product->is_in_stock() ) {
-            $this->backend_purge($product->get_id()) ;
-        }
-
-        do_action( 'litespeed_purge_post', $product->get_id() );
+    public function purge_product($product)
+    {
+        do_action('litespeed_debug', '[3rd] Woo Purge [pid]' . $product->get_id());
+
+        $config = apply_filters('litespeed_conf', self::O_UPDATE_INTERVAL);
+        if (is_null($config)) {
+            $config = self::O_PQS_CS;
+        }
+
+        if ($config === self::O_PQS_CQS) {
+            $this->backend_purge($product->get_id());
+        } elseif ($config !== self::O_PQS_CS && $product->is_in_stock()) {
+            do_action('litespeed_debug', '[3rd] Woo No purge needed [option] ' . $config);
+            return;
+        } elseif ($config !== self::O_PS_CN && !$product->is_in_stock()) {
+            $this->backend_purge($product->get_id());
+        }
+
+        do_action('litespeed_purge_post', $product->get_id());
 
         // Check if is variation, purge stock too #984479
-        if ( $product->is_type( 'variation' ) ) {
-            do_action( 'litespeed_purge_post', $product->get_parent_id() );
+        if ($product->is_type('variation')) {
+            do_action('litespeed_purge_post', $product->get_parent_id());
+        }
+
+        // Check if WPML is enabled ##972971
+        if (  defined( 'WPML_PLUGIN_BASENAME' ) ) {
+            // Check if it is a variable product and get post/parent ID
+            $wpml_purge_id = $product->is_type( 'variation' ) ? $product->get_parent_id() : $product->get_id();
+            $type = apply_filters( 'wpml_element_type', get_post_type( $wpml_purge_id ) );
+            $trid = apply_filters( 'wpml_element_trid', false, $wpml_purge_id, $type );
+            $translations = apply_filters( 'wpml_get_element_translations', array(), $trid, $type );
+            foreach ( $translations as $lang => $translation ) {
+            do_action( 'litespeed_debug', '[3rd] Woo WPML purge language: ' . $translation->language_code . ' , post ID: ' . $translation->element_id);
+            do_action( 'litespeed_purge_post', $translation->element_id );
+            // use the $translation->element_id as it is post ID of other languages
+            }
         }
     }
@@ -616 +630 @@
     public function delete_rel($post_id, $term_ids)
     {
-        if ( ! function_exists( 'wc_get_product' ) ) {
-            return ;
-        }
-
-        if ( empty($term_ids) || wc_get_product($post_id) === false ) {
-            return ;
-        }
-        foreach ( $term_ids as $term_id ) {
-            do_action( 'litespeed_purge', self::CACHETAG_TERM . $term_id );
+        if (!function_exists('wc_get_product')) {
+            return;
+        }
+
+        if (empty($term_ids) || wc_get_product($post_id) === false) {
+            return;
+        }
+        foreach ($term_ids as $term_id) {
+            do_action('litespeed_purge', self::CACHETAG_TERM . $term_id);
         }
     }
@@ -638 +652 @@
     public function backend_purge($post_id)
     {
-        if ( ! function_exists( 'wc_get_product' ) ) {
-            return ;
-        }
-
-        if ( ! isset($post_id) || wc_get_product($post_id) === false ) {
-            return ;
-        }
-
-        $cats = $this->get_cats($post_id) ;
-        if ( ! empty($cats) ) {
-            foreach ( $cats as $cat ) {
-                do_action( 'litespeed_purge', self::CACHETAG_TERM . $cat );
-            }
-        }
-
-        if ( ! function_exists( 'wc_get_product_terms' ) ) {
-            return ;
-        }
-
-        $tags = wc_get_product_terms($post_id, 'product_tag', array('fields' => 'ids')) ;
-        if ( ! empty($tags) ) {
-            foreach ( $tags as $tag ) {
-                do_action( 'litespeed_purge', self::CACHETAG_TERM . $tag );
+        if (!function_exists('wc_get_product')) {
+            return;
+        }
+
+        if (!isset($post_id) || wc_get_product($post_id) === false) {
+            return;
+        }
+
+        $cats = $this->get_cats($post_id);
+        if (!empty($cats)) {
+            foreach ($cats as $cat) {
+                do_action('litespeed_purge', self::CACHETAG_TERM . $cat);
+            }
+        }
+
+        if (!function_exists('wc_get_product_terms')) {
+            return;
+        }
+
+        $tags = wc_get_product_terms($post_id, 'product_tag', array('fields' => 'ids'));
+        if (!empty($tags)) {
+            foreach ($tags as $tag) {
+                do_action('litespeed_purge', self::CACHETAG_TERM . $tag);
             }
         }
@@ -677 +691 @@
     public function add_review($unused, $comment_approved, $commentdata)
     {
-        if ( ! function_exists( 'wc_get_product' ) ) {
-            return ;
-        }
-
-        $post_id = $commentdata['comment_post_ID'] ;
-        if ( $comment_approved !== 1 || ! isset($post_id) || wc_get_product($post_id) === false ) {
-            return ;
-        }
-        global $wp_widget_factory ;
-        $recent_reviews = $wp_widget_factory->widgets[ 'WC_Widget_Recent_Reviews' ] ;
-        if ( ! is_null( $recent_reviews ) ) {
-            do_action( 'litespeed_tag_add_widget', $recent_reviews->id );
+        if (!function_exists('wc_get_product')) {
+            return;
+        }
+
+        $post_id = $commentdata['comment_post_ID'];
+        if ($comment_approved !== 1 || !isset($post_id) || wc_get_product($post_id) === false) {
+            return;
+        }
+        global $wp_widget_factory;
+        $recent_reviews = $wp_widget_factory->widgets['WC_Widget_Recent_Reviews'];
+        if (!is_null($recent_reviews)) {
+            do_action('litespeed_tag_add_widget', $recent_reviews->id);
         }
     }
@@ -698 +712 @@
      * @since  3.0 new API
      */
-    private function _option_append() {
+    private function _option_append()
+    {
         // Append option save value filter
-        do_action( 'litespeed_conf_multi_switch', self::O_UPDATE_INTERVAL, 3 ); // This need to be before conf_append
-
-        do_action( 'litespeed_conf_append', self::O_UPDATE_INTERVAL, false );
+        do_action('litespeed_conf_multi_switch', self::O_UPDATE_INTERVAL, 3); // This need to be before conf_append
+
+        do_action('litespeed_conf_append', self::O_UPDATE_INTERVAL, false);
+        do_action('litespeed_conf_append', self::O_CART_VARY, false);
     }
 
@@ -711 +727 @@
      * @since 1.6.3 Removed static
      */
-    public function settings_add_tab( $setting_page )
-    {
-        if ( $setting_page != 'cache' ) {
-            return ;
-        }
-
-        require 'woocommerce.tab.tpl.php' ;
+    public function settings_add_tab($setting_page)
+    {
+        if ($setting_page != 'cache') {
+            return;
+        }
+
+        require 'woocommerce.tab.tpl.php';
     }
 
@@ -725 +741 @@
      * @since  3.0
      */
-    public function settings_add_content( $setting_page )
-    {
-        if ( $setting_page != 'cache' ) {
-            return ;
-        }
-
-        require 'woocommerce.content.tpl.php' ;
+    public function settings_add_content($setting_page)
+    {
+        if ($setting_page != 'cache') {
+            return;
+        }
+
+        require 'woocommerce.content.tpl.php';
     }
 
@@ -746 +762 @@
     private function get_cats($product_id)
     {
-        if ( ! function_exists( 'WC' ) ) {
-            return ;
-        }
-
-        $woocom = WC() ;
-        if ( isset($woocom) && version_compare($woocom->version, '2.5.0', '>=') && function_exists( 'wc_get_product_cat_ids' ) ) {
-            return wc_get_product_cat_ids($product_id) ;
-        }
-        $product_cats = wp_get_post_terms($product_id, 'product_cat', array("fields" => "ids")) ;
-        foreach ( $product_cats as $product_cat ) {
-            $product_cats = array_merge($product_cats, get_ancestors($product_cat, 'product_cat')) ;
-        }
-
-        return $product_cats ;
+        if (!function_exists('WC')) {
+            return;
+        }
+
+        $woocom = WC();
+        if (isset($woocom) && version_compare($woocom->version, '2.5.0', '>=') && function_exists('wc_get_product_cat_ids')) {
+            return wc_get_product_cat_ids($product_id);
+        }
+        $product_cats = wp_get_post_terms($product_id, 'product_cat', array("fields" => "ids"));
+        foreach ($product_cats as $product_cat) {
+            $product_cats = array_merge($product_cats, get_ancestors($product_cat, 'product_cat'));
+        }
+
+        return $product_cats;
     }
 
@@ -773 +789 @@
          * Bulk edit hook need to add to preload as it will die before detect.
          */
-        add_action( 'wp_ajax_wpmelon_adv_bulk_edit', __CLASS__ . '::bulk_edit_purge', 1 ) ;
+        add_action('wp_ajax_wpmelon_adv_bulk_edit', __CLASS__ . '::bulk_edit_purge', 1);
     }
 
@@ -783 +799 @@
     public static function bulk_edit_purge()
     {
-        if ( empty( $_POST[ 'type' ] ) || $_POST[ 'type' ] != 'saveproducts' || empty( $_POST[ 'data' ] ) ) return ;
+        if (empty($_POST['type']) || $_POST['type'] != 'saveproducts' || empty($_POST['data'])) return;
 
         /*
@@ -795 +811 @@
         *   )
         */
-        $stock_string_arr = array() ;
-        foreach ( $_POST[ 'data' ] as $stock_value ) {
-            $stock_string_arr = array_merge( $stock_string_arr, explode( '#^#', $stock_value ) ) ;
-        }
-
-        $lscwp_3rd_woocommerce = new self() ;
-
-        if ( count( $stock_string_arr ) < 1 ) {
-            return ;
-        }
-
-        foreach ( $stock_string_arr as $edited_stock ) {
-            $product_id = strtok( $edited_stock, '$' );
-            $product = wc_get_product( $product_id ) ;
-
-            if ( empty( $product ) ) {
-                do_action( 'litespeed_debug', '3rd woo purge: ' . $product_id . ' not found.' ) ;
-                continue ;
-            }
-
-            $lscwp_3rd_woocommerce->purge_product( $product );
+        $stock_string_arr = array();
+        foreach ($_POST['data'] as $stock_value) {
+            $stock_string_arr = array_merge($stock_string_arr, explode('#^#', $stock_value));
+        }
+
+        $lscwp_3rd_woocommerce = new self();
+
+        if (count($stock_string_arr) < 1) {
+            return;
+        }
+
+        foreach ($stock_string_arr as $edited_stock) {
+            $product_id = strtok($edited_stock, '$');
+            $product = wc_get_product($product_id);
+
+            if (empty($product)) {
+                do_action('litespeed_debug', '3rd woo purge: ' . $product_id . ' not found.');
+                continue;
+            }
+
+            $lscwp_3rd_woocommerce->purge_product($product);
         }
     }
 }
-

litespeed-cache/trunk/thirdparty/woocommerce.content.tpl.php

@@ -1 +1 @@
 <?php
+
 namespace LiteSpeed\Thirdparty;
 
-defined( 'WPINC' ) || exit;
+defined('WPINC') || exit;
 
 use \LiteSpeed\API;
@@ -13 +14 @@
 <div data-litespeed-layout='woocommerce'>
 
-<h3 class="litespeed-title-short">
-    <?php echo __( 'WooCommerce Settings', 'litespeed-cache' ); ?>
-    <?php Doc::learn_more( 'https://docs.litespeedtech.com/lscache/lscwp/cache/#woocommerce-tab' ); ?>
-</h3>
+    <h3 class="litespeed-title-short">
+        <?php echo __('WooCommerce Settings', 'litespeed-cache'); ?>
+        <?php Doc::learn_more('https://docs.litespeedtech.com/lscache/lscwp/cache/#woocommerce-tab'); ?>
+    </h3>
 
-<div class="litespeed-callout notice notice-warning inline">
-    <h4><?php echo __( 'NOTICE:', 'litespeed-cache' ); ?></h4>
-    <p><?php echo __( 'After verifying that the cache works in general, please test the cart.', 'litespeed-cache' ); ?></p>
-    <p><?php echo sprintf( __( 'To test the cart, visit the <a %s>FAQ</a>.', 'litespeed-cache' ), 'href="https://docs.litespeedtech.com/lscache/lscwp/installation/#non-cacheable-pages" target="_blank"' ); ?></p>
-    <p><?php echo __( 'By default, the My Account, Checkout, and Cart pages are automatically excluded from caching. Misconfiguration of page associations in WooCommerce settings may cause some pages to be erroneously excluded.', 'litespeed-cache' ); ?></p>
+    <div class="litespeed-callout notice notice-warning inline">
+        <h4><?php echo __('NOTICE:', 'litespeed-cache'); ?></h4>
+        <p><?php echo __('After verifying that the cache works in general, please test the cart.', 'litespeed-cache'); ?></p>
+        <p><?php echo sprintf(__('To test the cart, visit the <a %s>FAQ</a>.', 'litespeed-cache'), 'href="https://docs.litespeedtech.com/lscache/lscwp/installation/#non-cacheable-pages" target="_blank"'); ?></p>
+        <p><?php echo __('By default, the My Account, Checkout, and Cart pages are automatically excluded from caching. Misconfiguration of page associations in WooCommerce settings may cause some pages to be erroneously excluded.', 'litespeed-cache'); ?></p>
+    </div>
+
+    <table class="wp-list-table striped litespeed-table">
+        <tbody>
+            <tr>
+                <th>
+                    <?php $id = self::O_UPDATE_INTERVAL; ?>
+                    <?php echo __('Product Update Interval', 'litespeed-cache'); ?>
+                </th>
+                <td>
+                    <?php
+                    $options = array(
+                        self::O_PQS_CS  => __('Purge product on changes to the quantity or stock status.', 'litespeed-cache') . ' ' . __('Purge categories only when stock status changes.', 'litespeed-cache'),
+                        self::O_PS_CS   => __('Purge product and categories only when the stock status changes.', 'litespeed-cache'),
+                        self::O_PS_CN   => __('Purge product only when the stock status changes.', 'litespeed-cache') . ' ' . __('Do not purge categories on changes to the quantity or stock status.', 'litespeed-cache'),
+                        self::O_PQS_CQS => __('Always purge both product and categories on changes to the quantity or stock status.', 'litespeed-cache'),
+                    );
+                    $conf = (int) apply_filters('litespeed_conf', $id);
+                    foreach ($options as $k => $v) :
+                        $checked = (int) $k === $conf ? ' checked ' : '';
+                    ?>
+                        <?php do_action('litespeed_setting_enroll', $id); ?>
+                        <div class='litespeed-radio-row'>
+                            <input type='radio' autocomplete='off' name='<?php echo $id; ?>' id='conf_<?php echo $id; ?>_<?php echo $k; ?>' value='<?php echo $k; ?>' <?php echo $checked; ?> />
+                            <label for='conf_<?php echo $id; ?>_<?php echo $k; ?>'><?php echo $v; ?></label>
+                        </div>
+                    <?php endforeach; ?>
+                    <div class="litespeed-desc">
+                        <?php echo __('Determines how changes in product quantity and product stock status affect product pages and their associated category pages.', 'litespeed-cache'); ?>
+                    </div>
+                </td>
+            </tr>
+
+            <tr>
+                <th>
+                    <?php $id = self::O_CART_VARY; ?>
+                    <?php echo __('Vary for Mini Cart', 'litespeed-cache'); ?>
+                </th>
+                <td>
+                    <?php
+                    $conf = (int) apply_filters('litespeed_conf', $id);
+                    $this->cls('Admin_Display')->build_switch($id); ?>
+                    <div class="litespeed-desc">
+                        <?php echo __('Generate a separate vary cache copy for the mini cart when the cart is not empty.', 'litespeed-cache'); ?>
+                        <?php echo __('If your theme does not use JS to update the mini cart, you must enable this option to display the correct cart contents.', 'litespeed-cache'); ?>
+                        <br /><?php Doc::notice_htaccess(); ?>
+                    </div>
+                </td>
+            </tr>
+
+        </tbody>
+    </table>
 </div>
-
-<table class="wp-list-table striped litespeed-table"><tbody>
-    <tr>
-        <th>
-            <?php $id = self::O_UPDATE_INTERVAL; ?>
-            <?php echo __( 'Product Update Interval', 'litespeed-cache' ); ?>
-        </th>
-        <td>
-            <?php
-            $options = array(
-                self::O_PQS_CS  => __( 'Purge product on changes to the quantity or stock status.', 'litespeed-cache' ) . ' ' . __( 'Purge categories only when stock status changes.', 'litespeed-cache' ),
-                self::O_PS_CS   => __( 'Purge product and categories only when the stock status changes.', 'litespeed-cache' ),
-                self::O_PS_CN   => __( 'Purge product only when the stock status changes.', 'litespeed-cache' ) . ' ' . __( 'Do not purge categories on changes to the quantity or stock status.', 'litespeed-cache' ),
-                self::O_PQS_CQS => __( 'Always purge both product and categories on changes to the quantity or stock status.', 'litespeed-cache' ),
-            );
-            $conf = (int) apply_filters( 'litespeed_conf', $id );
-            foreach ( $options as $k => $v ) :
-                $checked = (int) $k === $conf ? ' checked ' : '';
-            ?>
-                <?php do_action( 'litespeed_setting_enroll', $id ); ?>
-                <div class='litespeed-radio-row'>
-                    <input type='radio' autocomplete='off' name='<?php echo $id; ?>' id='conf_<?php echo $id; ?>_<?php echo $k; ?>' value='<?php echo $k; ?>' <?php echo $checked; ?> />
-                    <label for='conf_<?php echo $id; ?>_<?php echo $k; ?>'><?php echo $v; ?></label>
-                </div>
-            <?php endforeach; ?>
-            <div class="litespeed-desc">
-                <?php echo __( 'Determines how changes in product quantity and product stock status affect product pages and their associated category pages.', 'litespeed-cache' ); ?>
-            </div>
-        </td>
-    </tr>
-
-</tbody></table>
-
-</div>

litespeed-cache/trunk/tpl/dash/dashboard.tpl.php

@@ -607 +607 @@
             </div>
 
+            <div class="postbox litespeed-postbox litespeed-postbox-quiccloud litespeed-bg-quic-cloud">
+                <div class="inside litespeed-text-center">
+                    <h3 class="litespeed-title">
+                        QUIC.cloud
+                        <a href="https://www.quic.cloud/quic-cloud-services-and-features/litespeed-cache-service/" class="litespeed-title-right-icon">Learn More</a>
+                    </h3>
+                    <p class="litespeed-top20 litespeed-text-bold litespeed-margin-bottom20">
+                        <a href="https://www.quic.cloud/docs/onboarding/" class="">Try QUIC.cloud CDN!</a>
+                    </p>
+                    <p class="litespeed-margin-y5">
+                        Best available WordPress performance
+                    </p>
+                    <p class="litespeed-margin-y5">
+                        Globally fast TTFB, easy setup, and <a href="https://www.quic.cloud/quic-cloud-services-and-features/litespeed-cache-service/">more</a>!
+                    </p>
+                    <div class="litespeed-top10">
+                        <img src="<?php echo LSWCP_PLUGIN_URL; ?>assets/img/quic-cloud-logo.svg" alt="QUIC.cloud" width="45%" height="auto">
+                    </div>
+                </div>
+            </div>
+
         </div>
 
     </div>
 
-
 </div>

litespeed-cache/trunk/tpl/page_optm/settings_html.tpl.php

@@ -1 +1 @@
 <?php
+
 namespace LiteSpeed;
-defined( 'WPINC' ) || exit;
+
+defined('WPINC') || exit;
 ?>
 
 <h3 class="litespeed-title-short">
-    <?php echo __( 'HTML Settings', 'litespeed-cache' ); ?>
-    <?php Doc::learn_more( 'https://docs.litespeedtech.com/lscache/lscwp/pageopt/#html-settings-tab' ); ?>
+    <?php echo __('HTML Settings', 'litespeed-cache'); ?>
+    <?php Doc::learn_more('https://docs.litespeedtech.com/lscache/lscwp/pageopt/#html-settings-tab'); ?>
 </h3>
 
-<table class="wp-list-table striped litespeed-table"><tbody>
-    <tr>
-        <th>
-            <?php $id = Base::O_OPTM_HTML_MIN; ?>
-            <?php $this->title( $id ); ?>
-        </th>
-        <td>
-            <?php $this->build_switch( $id ); ?>
-            <div class="litespeed-desc">
-                <?php echo __( 'Minify HTML content.', 'litespeed-cache' ); ?>
-            </div>
-        </td>
-    </tr>
+<table class="wp-list-table striped litespeed-table">
+    <tbody>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_HTML_MIN; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_switch($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo __('Minify HTML content.', 'litespeed-cache'); ?>
+                </div>
+            </td>
+        </tr>
 
-    <tr>
-        <th>
-            <?php $id = Base::O_OPTM_DNS_PREFETCH; ?>
-            <?php $this->title( $id ); ?>
-        </th>
-        <td>
-            <?php $this->build_textarea( $id ); ?>
-            <div class="litespeed-desc">
-                <?php echo __( 'Prefetching DNS can reduce latency for visitors.', 'litespeed-cache' ); ?>
-                <?php echo __( 'For example', 'litespeed-cache' ); ?>: <code>//www.example.com</code>
-                <?php Doc::one_per_line(); ?>
-                <?php Doc::learn_more( 'https://docs.litespeedtech.com/lscache/lscwp/pageopt/#dns-prefetch' ); ?>
-            </div>
-        </td>
-    </tr>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_DNS_PREFETCH; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_textarea($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo __('Prefetching DNS can reduce latency for visitors.', 'litespeed-cache'); ?>
+                    <?php echo __('For example', 'litespeed-cache'); ?>: <code>//www.example.com</code>
+                    <?php Doc::one_per_line(); ?>
+                    <?php Doc::learn_more('https://docs.litespeedtech.com/lscache/lscwp/pageopt/#dns-prefetch'); ?>
+                </div>
+            </td>
+        </tr>
 
-    <tr>
-        <th>
-            <?php $id = Base::O_OPTM_DNS_PREFETCH_CTRL; ?>
-            <?php $this->title( $id ); ?>
-        </th>
-        <td>
-            <?php $this->build_switch( $id ); ?>
-            <div class="litespeed-desc">
-                <?php echo __( 'Automatically enable DNS prefetching for all URLs in the document, including images, CSS, JavaScript, and so forth.', 'litespeed-cache' ); ?>
-                <?php echo __( 'This can improve the page loading speed.', 'litespeed-cache' ); ?>
-                <?php Doc::learn_more( 'https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-DNS-Prefetch-Control' ); ?>
-            </div>
-        </td>
-    </tr>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_DNS_PREFETCH_CTRL; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_switch($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo __('Automatically enable DNS prefetching for all URLs in the document, including images, CSS, JavaScript, and so forth.', 'litespeed-cache'); ?>
+                    <?php echo __('This can improve the page loading speed.', 'litespeed-cache'); ?>
+                    <?php Doc::learn_more('https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-DNS-Prefetch-Control'); ?>
+                </div>
+            </td>
+        </tr>
 
-    <tr>
-        <th>
-            <?php $id = Base::O_OPTM_HTML_LAZY; ?>
-            <?php $this->title( $id ); ?>
-        </th>
-        <td>
-            <?php $this->build_textarea( $id ); ?>
-            <div class="litespeed-desc">
-                <?php echo __( 'Delay rendering off-screen HTML elements by its selector.', 'litespeed-cache' ); ?>
-                <?php Doc::one_per_line(); ?>
-                <?php Doc::learn_more( 'https://docs.litespeedtech.com/lscache/lscwp/pageopt/#html-lazyload-selectors' ); ?>
-            </div>
-        </td>
-    </tr>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_DNS_PRECONNECT; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_textarea($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo __('Preconnecting speeds up future loads from a given origin.', 'litespeed-cache'); ?>
+                    <?php echo __('For example', 'litespeed-cache'); ?>: <code>https://example.com</code>
+                    <?php Doc::one_per_line(); ?>
+                    <?php Doc::learn_more('https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel/preconnect'); ?>
+                </div>
+            </td>
+        </tr>
 
-    <tr>
-        <th>
-            <?php $id = Base::O_OPTM_QS_RM; ?>
-            <?php $this->title( $id ); ?>
-        </th>
-        <td>
-            <?php $this->build_switch( $id ); ?>
-            <div class="litespeed-desc">
-                <?php echo __( 'Remove query strings from internal static resources.', 'litespeed-cache' ); ?>
-                <br /><font class="litespeed-warning">
-                    ⚠️
-                    <?php echo __( 'Google reCAPTCHA will be bypassed automatically.', 'litespeed-cache' ); ?>
-                </font>
-                <br /><font class="litespeed-success">
-                    <?php echo __( 'API', 'litespeed-cache' ); ?>:
-                    <?php echo sprintf( __( 'Append query string %s to the resources to bypass this action.', 'litespeed-cache' ), '<code>&_litespeed_rm_qs=0</code>' ); ?>
-                </font>
-            </div>
-        </td>
-    </tr>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_HTML_LAZY; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_textarea($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo __('Delay rendering off-screen HTML elements by its selector.', 'litespeed-cache'); ?>
+                    <?php Doc::one_per_line(); ?>
+                    <?php Doc::learn_more('https://docs.litespeedtech.com/lscache/lscwp/pageopt/#html-lazyload-selectors'); ?>
+                </div>
+            </td>
+        </tr>
 
-    <tr>
-        <th>
-            <?php $id = Base::O_OPTM_GGFONTS_ASYNC; ?>
-            <?php $this->title( $id ); ?>
-        </th>
-        <td>
-            <?php $this->build_switch( $id ); ?>
-            <div class="litespeed-desc">
-                <?php echo __( 'Use Web Font Loader library to load Google Fonts asynchronously while leaving other CSS intact.', 'litespeed-cache' ); ?>
-                <?php echo __( 'This will also add a preconnect to Google Fonts to establish a connection earlier.', 'litespeed-cache' ); ?>
-                <?php Doc::learn_more( 'https://docs.litespeedtech.com/lscache/lscwp/pageopt/#load-google-fonts-asynchronously' ); ?>
-            </div>
-        </td>
-    </tr>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_QS_RM; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_switch($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo __('Remove query strings from internal static resources.', 'litespeed-cache'); ?>
+                    <br />
+                    <font class="litespeed-warning">
+                        ⚠️
+                        <?php echo __('Google reCAPTCHA will be bypassed automatically.', 'litespeed-cache'); ?>
+                    </font>
+                    <br />
+                    <font class="litespeed-success">
+                        <?php echo __('API', 'litespeed-cache'); ?>:
+                        <?php echo sprintf(__('Append query string %s to the resources to bypass this action.', 'litespeed-cache'), '<code>&_litespeed_rm_qs=0</code>'); ?>
+                    </font>
+                </div>
+            </td>
+        </tr>
 
-    <tr>
-        <th>
-            <?php $id = Base::O_OPTM_GGFONTS_RM; ?>
-            <?php $this->title( $id ); ?>
-        </th>
-        <td>
-            <?php $this->build_switch( $id ); ?>
-            <div class="litespeed-desc">
-                <?php echo __( 'Prevent Google Fonts from loading on all pages.', 'litespeed-cache' ); ?>
-            </div>
-        </td>
-    </tr>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_GGFONTS_ASYNC; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_switch($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo __('Use Web Font Loader library to load Google Fonts asynchronously while leaving other CSS intact.', 'litespeed-cache'); ?>
+                    <?php echo __('This will also add a preconnect to Google Fonts to establish a connection earlier.', 'litespeed-cache'); ?>
+                    <?php Doc::learn_more('https://docs.litespeedtech.com/lscache/lscwp/pageopt/#load-google-fonts-asynchronously'); ?>
+                </div>
+            </td>
+        </tr>
 
-    <tr>
-        <th>
-            <?php $id = Base::O_OPTM_EMOJI_RM; ?>
-            <?php $this->title( $id ); ?>
-        </th>
-        <td>
-            <?php $this->build_switch( $id ); ?>
-            <div class="litespeed-desc">
-                <?php echo __( 'Stop loading WordPress.org emoji. Browser default emoji will be displayed instead.', 'litespeed-cache' ); ?>
-                <?php echo __( 'This can improve your speed score in services like Pingdom, GTmetrix and PageSpeed.', 'litespeed-cache' ); ?>
-            </div>
-        </td>
-    </tr>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_GGFONTS_RM; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_switch($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo __('Prevent Google Fonts from loading on all pages.', 'litespeed-cache'); ?>
+                </div>
+            </td>
+        </tr>
 
-    <tr>
-        <th>
-            <?php $id = Base::O_OPTM_NOSCRIPT_RM; ?>
-            <?php $this->title( $id ); ?>
-        </th>
-        <td>
-            <?php $this->build_switch( $id ); ?>
-            <div class="litespeed-desc">
-                <?php echo sprintf( __( 'This option will remove all %s tags from HTML.', 'litespeed-cache' ), '<code>&lt;noscript&gt;</code>' ); ?>
-                <?php Doc::learn_more( 'https://docs.litespeedtech.com/lscache/lscwp/pageopt/#remove-noscript-tags' ); ?>
-            </div>
-        </td>
-    </tr>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_EMOJI_RM; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_switch($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo __('Stop loading WordPress.org emoji. Browser default emoji will be displayed instead.', 'litespeed-cache'); ?>
+                    <?php echo __('This can improve your speed score in services like Pingdom, GTmetrix and PageSpeed.', 'litespeed-cache'); ?>
+                </div>
+            </td>
+        </tr>
 
-</tbody></table>
+        <tr>
+            <th>
+                <?php $id = Base::O_OPTM_NOSCRIPT_RM; ?>
+                <?php $this->title($id); ?>
+            </th>
+            <td>
+                <?php $this->build_switch($id); ?>
+                <div class="litespeed-desc">
+                    <?php echo sprintf(__('This option will remove all %s tags from HTML.', 'litespeed-cache'), '<code>&lt;noscript&gt;</code>'); ?>
+                    <?php Doc::learn_more('https://docs.litespeedtech.com/lscache/lscwp/pageopt/#remove-noscript-tags'); ?>
+                </div>
+            </td>
+        </tr>
+
+    </tbody>
+</table>