Commit 35ad13ff3ed for php.net
commit 35ad13ff3ed5b9b6c04cae1a2ac210660292fb9f
Merge: e1938972260 754ea6e14e6
Author: David Carlier <devnexen@gmail.com>
Date: Sat Jul 18 23:09:41 2026 +0100
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
ext/sockets: memory related issues fix.
diff --cc ext/sockets/sockets.c
index 5c8ad859851,565a2d791bc..a61f1a5d9a4
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@@ -2033,9 -1862,13 +2034,13 @@@ PHP_FUNCTION(socket_set_option
php_socket *php_sock;
int ov, optlen, retval;
#ifdef PHP_WIN32
- int timeout;
+ DWORD timeout;
#else
struct timeval tv;
+ #endif
+ #ifdef SO_ATTACH_REUSEPORT_CBPF
+ struct sock_filter cbpf[8] = {0};
+ struct sock_fprog bpfprog;
#endif
zend_long level, optname;
void *opt_ptr;