From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 21 Feb 2013 08:11:03 +0000 (+0400)
Subject: Added ability to always validate cached script timestamps using zend_optimizerplus... 
X-Git-Tag: php-5.5.0beta1~42^2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a06991ffda1ed6baa1c6004e2f113347955a3e1;p=php

Added ability to always validate cached script timestamps using zend_optimizerplus.revalidate_freq=0
---

diff --git a/README b/README
index 71b5af6a08..3854915242 100644
--- a/README
+++ b/README
@@ -98,7 +98,8 @@ zend_optimizerplus.validate_timestamps (default "1")
 
 zend_optimizerplus.revalidate_freq (default "2")
 	How often (in seconds) to check file timestamps for changes to the shared
-	memory storage allocation.
+	memory storage allocation. ("1" means validate once per second, but only
+	once per request. "0" means always validate)
 
 zend_optimizerplus.revalidate_path (default "0")
 	Enables or disables file search in include_path optimization
diff --git a/ZendAccelerator.c b/ZendAccelerator.c
index 1ddc2a9242..2d84b37a30 100644
--- a/ZendAccelerator.c
+++ b/ZendAccelerator.c
@@ -828,7 +828,8 @@ static void zend_accel_schedule_restart_if_necessary(TSRMLS_D)
 
 static inline int validate_timestamp_and_record(zend_persistent_script *persistent_script, zend_file_handle *file_handle TSRMLS_DC)
 {
-	if (persistent_script->dynamic_members.revalidate >= ZCSG(revalidate_at)) {
+	if (ZCG(accel_directives).revalidate_freq &&
+	    (persistent_script->dynamic_members.revalidate >= ZCSG(revalidate_at))) {
 		return SUCCESS;
 	} else if (do_validate_timestamps(persistent_script, file_handle TSRMLS_CC)==FAILURE) {
 		return FAILURE;