VladPolskiy/php-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source
This commit is contained in:
David CARLIER
2023-07-13 12:40:59 +01:00
parent d9db446065 0309800b4d
commit a077c2dd6c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

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

4
Zend/zend_gdb.c
View File

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