Skip to content

Commit 69b4360

Browse files
committedJul 13, 2023
zend_gdb disable gdb detection for FreeBSD < 11.
ref PR: #11599. Close GH-11646
1 parent 536dbd7 commit 69b4360

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed
 

‎NEWS

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ PHP NEWS
1313
. Fixed oss-fuzz #60011 (Mis-compilation of by-reference nullsafe operator).
1414
(ilutov)
1515
. Fixed use-of-uninitialized-value with ??= on assert. (ilutov)
16+
. Fixed build for FreeBSD before the 11.0 releases. (David Carlier)
1617

1718
- Curl:
1819
. Fix crash when an invalid callback function is passed to

‎Zend/zend_gdb.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <fcntl.h>
2626
#include <unistd.h>
2727

28-
#if defined(__FreeBSD__)
28+
#if defined(__FreeBSD__) && __FreeBSD_version >= 1100000
2929
# include <sys/user.h>
3030
# include <libutil.h>
3131
#endif
@@ -142,7 +142,7 @@ ZEND_API bool zend_gdb_present(void)
142142

143143
close(fd);
144144
}
145-
#elif defined(__FreeBSD__)
145+
#elif defined(__FreeBSD__) && __FreeBSD_version >= 1100000
146146
struct kinfo_proc *proc = kinfo_getproc(getpid());
147147

148148
if (proc) {

0 commit comments

Comments
 (0)