Simplify the logic and fix Windows build

Author: Sannis

ext/opcache/ZendAccelerator.c

@@ -76,7 +76,12 @@ typedef int gid_t;
 #endif
 #include <fcntl.h>
 #include <signal.h>
+
+#ifndef PHP_WIN32
 #include <time.h>
+#else
+#include "win32/time.h"
+#endif
 
 #ifndef ZEND_WIN32
 # include <sys/types.h>
@@ -1164,33 +1169,31 @@ zend_result validate_timestamp_and_record(zend_persistent_script *persistent_scr
 		return SUCCESS; /* Don't check timestamps of preloaded scripts */
 	}
 
+	double revalidate_reference_time = 0.0;
+
 	if (ZCG(cli_mode)) {
+#if HAVE_GETTIMEOFDAY
 		struct timeval tp = {0};
 
-		//check current time as opposed to the "time of request"
-		if (gettimeofday(&tp, NULL) != 0) {
-			return SUCCESS;
-		}
-
-		double now = (double)(tp.tv_sec + tp.tv_usec / 1000000.00);
-
-		if (ZCG(accel_directives).revalidate_freq && persistent_script->dynamic_members.revalidate >= now) {
-			return SUCCESS;
-		} else if (do_validate_timestamps(persistent_script, file_handle) == FAILURE) {
-			return FAILURE;
+		if (UNEXPECTED(gettimeofday(&tp, NULL) != 0)) {
+			revalidate_reference_time = (double)time(NULL);
 		} else {
-			persistent_script->dynamic_members.revalidate = now + ZCG(accel_directives).revalidate_freq;
-			return SUCCESS;
+			revalidate_reference_time = (double)(tp.tv_sec + tp.tv_usec / 1000000.00);
 		}
+#else
+		revalidate_reference_time = (double)time(NULL);
+#endif
 	} else {
-		if (ZCG(accel_directives).revalidate_freq && persistent_script->dynamic_members.revalidate >= ZCG(request_time)) {
-			return SUCCESS;
-		} else if (do_validate_timestamps(persistent_script, file_handle) == FAILURE) {
-			return FAILURE;
-		} else {
-			persistent_script->dynamic_members.revalidate = ZCG(request_time) + ZCG(accel_directives).revalidate_freq;
-			return SUCCESS;
-		}
+		revalidate_reference_time = (double)ZCG(request_time);
+	}
+
+	if (ZCG(accel_directives).revalidate_freq && persistent_script->dynamic_members.revalidate >= revalidate_reference_time) {
+		return SUCCESS;
+	} else if (do_validate_timestamps(persistent_script, file_handle) == FAILURE) {
+		return FAILURE;
+	} else {
+		persistent_script->dynamic_members.revalidate = revalidate_reference_time + ZCG(accel_directives).revalidate_freq;
+		return SUCCESS;
 	}
 }