clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'PHP-8.3'"

Browse Source 
This reverts commit b363a606a4, reversing
changes made to 3ed5eee5d3.
This commit is contained in:
Christoph M. Becker 2024-08-20 16:09:46 +02:00
parent 96840072fc
commit b75775ea39
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zend/zend_max_execution_timer.c
View File

@ -27,13 +27,14 @@
# include <pthread_np.h>
# endif
#include "zend.h"
#include "zend_globals.h"
#include "zend_portability.h"
#if __has_feature(memory_sanitizer)
# include <sanitizer/msan_interface.h>
#endif
#include "zend.h"
#include "zend_globals.h"
// Musl Libc defines this macro, glibc does not
// According to "man 2 timer_create" this field should always be available, but it's not: https://sourceware.org/bugzilla/show_bug.cgi?id=27417
# ifndef sigev_notify_thread_id
@ -67,8 +68,8 @@ ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
#if __has_feature(memory_sanitizer)
/* MSan does not intercept timer_create() */
__msan_unpoison(&EG(max_execution_timer_timer),
sizeof(EG(max_execution_timer_timer)));
__msan_unpoison(&EG(max_execution_timer_timer),
sizeof(EG(max_execution_timer_timer)));
#endif
// Measure wall time instead of CPU time as originally planned now that it is possible https://github.com/php/php-src/pull/6504#issuecomment-1370303727