Removed unused exec_time & fetch_time in zend_accelerator_module

marc-mabe · marc-mabe · commit 8c044c80d09a · 2025-07-23T15:19:11.000+02:00
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -599,8 +599,6 @@ static int accelerator_get_scripts(zval *return_value)
 	zval persistent_script_report;
 	zend_accel_hash_entry *cache_entry;
 	struct tm *ta;
-	struct timeval exec_time;
-	struct timeval fetch_time;
 
 	if (!ZCG(accelerator_enabled) || accelerator_shm_read_lock() != SUCCESS) {
 		return 0;
@@ -630,8 +628,6 @@ static int accelerator_get_scripts(zval *return_value)
 			if (ZCG(accel_directives).validate_timestamps) {
 				add_assoc_long(&persistent_script_report, "timestamp", (zend_long)script->timestamp);
 			}
-			timerclear(&exec_time);
-			timerclear(&fetch_time);
 
 			add_assoc_long(&persistent_script_report, "revalidate", (zend_long)script->dynamic_members.revalidate);
 
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -2350,14 +2350,12 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val
 
 				if (value == -1) {
 					if (sslsock->s.timeout.tv_sec == -1) {
-						tv.tv_sec  = (time_t)FG(default_socket_timeout);
-						tv.tv_usec = 0;
+						php_timei2val(FG(default_socket_timeout), tv);
 					} else {
 						tv = sslsock->connect_timeout;
 					}
 				} else {
-					tv.tv_sec  = value;
-					tv.tv_usec = 0;
+					php_timei2val(value, tv);
 				}
 
 				if (sslsock->s.socket == -1) {
@@ -2669,8 +2667,7 @@ php_stream *php_openssl_ssl_socket_factory(const char *proto, size_t protolen,
 
 	sslsock->s.is_blocked = 1;
 	/* this timeout is used by standard stream funcs, therefore it should use the default value */
-	sslsock->s.timeout.tv_sec  = (time_t)FG(default_socket_timeout);
-	sslsock->s.timeout.tv_usec = 0;
+	php_timei2val(FG(default_socket_timeout), sslsock->s.timeout);
 
 	/* use separate timeout for our private funcs */
 	sslsock->connect_timeout.tv_sec  = timeout->tv_sec;
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
@@ -16,6 +16,8 @@
   +----------------------------------------------------------------------+
 */
 
+#include "php_time.h"
+
 #include "php_soap.h"
 #include "ext/hash/php_hash.h" /* For php_hash_bin2hex() */
 
diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
@@ -20,6 +20,9 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
+#ifdef PHP_WIN32
+#include "win32/getrusage.h"
+#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
