v7.4-b12: * **Cache** Used WordPress Cache-Control value when the page is not cacheable. (asafm7)

Author: Hai Zheng

litespeed-cache.php

@@ -3,7 +3,7 @@
  * Plugin Name:       LiteSpeed Cache
  * Plugin URI:        https://www.litespeedtech.com/products/cache-plugins/wordpress-acceleration
  * Description:       High-performance page caching and site optimization from LiteSpeed
- * Version:           7.4-b11
+ * Version:           7.4-b12
  * Author:            LiteSpeed Technologies
  * Author URI:        https://www.litespeedtech.com
  * License:           GPLv3
@@ -35,7 +35,7 @@
 	return;
 }
 
-! defined( 'LSCWP_V' ) && define( 'LSCWP_V', '7.4-b11' );
+! defined( 'LSCWP_V' ) && define( 'LSCWP_V', '7.4-b12' );
 
 ! defined( 'LSCWP_CONTENT_DIR' ) && define( 'LSCWP_CONTENT_DIR', WP_CONTENT_DIR );
 ! defined( 'LSCWP_DIR' ) && define( 'LSCWP_DIR', __DIR__ . '/' ); // Full absolute path '/var/www/html/***/wp-content/plugins/litespeed-cache/' or MU

readme.txt

@@ -261,6 +261,7 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro
 * 🌱**Toolbox** Disable All for 24 Hours. (PR#886)
 * **Cache** Better match iPhone browsers for mobile cache detection.
 * **Cache** Dropped `advanced-cache.php` since WP version v5.3+ required.
+* **Cache** Used WordPress `Cache-Control` value when the page is not cacheable. (asafm7)
 * **Page Optimize** Better compatibility for dummy CSS removal in case other plugins manipulated the quotes.
 * **Page Optimize** Dropped v4.2 legacy `LITESPEED_BYPASS_OPTM`.
 * **Crawler** Used .html file to test port in case some security plugins blocked .txt which caused port test failure. (#661828)

src/core.cls.php

@@ -597,8 +597,11 @@ public function send_headers( $is_forced = false ) {
 		// Send Control header
 		if ( defined( 'LITESPEED_ON' ) && $control_header ) {
 			$this->http_header( $control_header );
-			if ( ! Control::is_cacheable() ) {
-				$this->http_header( 'Cache-Control: no-cache, no-store, must-revalidate, max-age=0' ); // @ref: https://wordpress.org/support/topic/apply_filterslitespeed_control_cacheable-returns-false-for-cacheable/
+			if ( ! Control::is_cacheable() && !is_admin() ) {
+				$ori_wp_header = wp_get_nocache_headers();
+				if ( isset( $ori_wp_header['Cache-Control'] ) ) {
+					$this->http_header( 'Cache-Control: ' . $ori_wp_header['Cache-Control'] ); // @ref: https://github.com/litespeedtech/lscache_wp/issues/889
+				}
 			}
 			if ( defined( 'LSCWP_LOG' ) ) {
 				$this->comment( $control_header );