Merge branch 'PHP-8.2'

This commit is contained in:
David CARLIER 2023-07-13 12:40:59 +01:00
commit a077c2dd6c
2 changed files with 3 additions and 2 deletions

1
NEWS
View File

@ -13,6 +13,7 @@ PHP NEWS
exceptions). (ilutov)
. Added zend_call_stack_get implementation for OpenBSD. (David Carlier)
. Fixed oss-fuzz #60411 (Fix double-compilation of arrow-functions). (ilutov)
. Fixed build for FreeBSD before the 11.0 releases. (David Carlier)
- DOM:
. Added DOMNode::contains() and DOMNameSpaceNode::contains(). (nielsdos)

View File

@ -25,7 +25,7 @@
#include <fcntl.h>
#include <unistd.h>
#if defined(__FreeBSD__)
#if defined(__FreeBSD__) && __FreeBSD_version >= 1100000
# include <sys/user.h>
# include <libutil.h>
#endif
@ -142,7 +142,7 @@ ZEND_API bool zend_gdb_present(void)
close(fd);
}
#elif defined(__FreeBSD__)
#elif defined(__FreeBSD__) && __FreeBSD_version >= 1100000
struct kinfo_proc *proc = kinfo_getproc(getpid());
if (proc) {