Added ability to always validate cached script timestamps using zend_optimizerplus...

diff --git a/README b/README
index 71b5af6a084d40146c3bb7e26dc02c60ffe75e4f..3854915242518de3de659d046e9611b61e532343 100644 (file)
--- 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 1ddc2a9242414665b7ad0343443b86342a35dc22..2d84b37a30b4168b87e8b692c561da702f383c24 100644 (file)
--- 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;