@@ -1164,38 +1164,31 @@ zend_result validate_timestamp_and_record(zend_persistent_script *persistent_scr
1164
1164
return SUCCESS ; /* Don't check timestamps of preloaded scripts */
1165
1165
}
1166
1166
1167
+ double revalidate_reference_time = 0.0 ;
1168
+
1167
1169
if (ZCG (cli_mode )) {
1168
- // check current time as opposed to the "time of request"
1169
- double now = 0.0 ;
1170
1170
#ifdef HAVE_GETTIMEOFDAY
1171
1171
struct timeval tp = {0 };
1172
1172
1173
1173
if (UNEXPECTED (gettimeofday (& tp , NULL ) != 0 )) {
1174
- now = (double )time (NULL );
1174
+ revalidate_reference_time = (double )time (NULL );
1175
1175
} else {
1176
- now = (double )(tp .tv_sec + tp .tv_usec / 1000000.00 );
1176
+ revalidate_reference_time = (double )(tp .tv_sec + tp .tv_usec / 1000000.00 );
1177
1177
}
1178
1178
#else
1179
- now = (double )time (NULL );
1179
+ revalidate_reference_time = (double )time (NULL );
1180
1180
#endif
1181
+ } else {
1182
+ revalidate_reference_time = (double )ZCG (request_time );
1183
+ }
1181
1184
1182
- if (ZCG (accel_directives ).revalidate_freq && persistent_script -> dynamic_members .revalidate >= now ) {
1183
- return SUCCESS ;
1184
- } else if (do_validate_timestamps (persistent_script , file_handle ) == FAILURE ) {
1185
- return FAILURE ;
1186
- } else {
1187
- persistent_script -> dynamic_members .revalidate = now + ZCG (accel_directives ).revalidate_freq ;
1188
- return SUCCESS ;
1189
- }
1185
+ if (ZCG (accel_directives ).revalidate_freq && persistent_script -> dynamic_members .revalidate >= revalidate_reference_time ) {
1186
+ return SUCCESS ;
1187
+ } else if (do_validate_timestamps (persistent_script , file_handle ) == FAILURE ) {
1188
+ return FAILURE ;
1190
1189
} else {
1191
- if (ZCG (accel_directives ).revalidate_freq && persistent_script -> dynamic_members .revalidate >= ZCG (request_time )) {
1192
- return SUCCESS ;
1193
- } else if (do_validate_timestamps (persistent_script , file_handle ) == FAILURE ) {
1194
- return FAILURE ;
1195
- } else {
1196
- persistent_script -> dynamic_members .revalidate = ZCG (request_time ) + ZCG (accel_directives ).revalidate_freq ;
1197
- return SUCCESS ;
1198
- }
1190
+ persistent_script -> dynamic_members .revalidate = revalidate_reference_time + ZCG (accel_directives ).revalidate_freq ;
1191
+ return SUCCESS ;
1199
1192
}
1200
1193
}
1201
1194
0 commit comments