File tree Expand file tree Collapse file tree 3 files changed +9
-1
lines changed Expand file tree Collapse file tree 3 files changed +9
-1
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ PHP NEWS
12
12
. Using null as an array offset or when calling array_key_exists() is now
13
13
deprecated. (alexandre-daubois)
14
14
. Fixed bug GH-19681 (PHP_EXPAND_PATH broken with bash 5.3.0). (Remi)
15
+ . Marks the stack as non-executable on Haiku. (David Carlier)
15
16
16
17
- CLI:
17
18
. Fixed bug GH-19461 (Improve error message on listening error with IPv6
Original file line number Diff line number Diff line change @@ -217,7 +217,12 @@ dnl supports it. This can help reduce the binary size and startup time.
217
217
AX_CHECK_COMPILE_FLAG ( [ -fvisibility=hidden] ,
218
218
[ CFLAGS="$CFLAGS -fvisibility=hidden"] )
219
219
220
+ dnl to disable executable stack on haiku due
221
+ dnl to missing elf .note.GNU-stack part
220
222
case $host_alias in
223
+ *haiku*)
224
+ LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
225
+ ;;
221
226
*solaris*)
222
227
CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
223
228
;;
Original file line number Diff line number Diff line change @@ -109,7 +109,9 @@ ZEND_DECLARE_MODULE_GLOBALS(sockets)
109
109
} \
110
110
} while (0)
111
111
#else
112
- #define PHP_ETH_PROTO_CHECK (protocol , family ) (0)
112
+ #define PHP_ETH_PROTO_CHECK (protocol , family ) \
113
+ (void)protocol; \
114
+ (void)family
113
115
#endif
114
116
115
117
static PHP_GINIT_FUNCTION (sockets );
You can’t perform that action at this time.
0 commit comments