archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source
This commit is contained in:
David Carlier 2025-05-22 20:47:25 +01:00
commit c00d7e056a
No known key found for this signature in database
GPG key ID: 2FB76A8CE6CD2B41
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/sockets/conversions.c
View file

@ -1457,7 +1457,11 @@ void to_zval_read_fd_array(const char *data, zval *zv, res_context *ctx)
object_init_ex(&elem, socket_ce);
php_socket *sock = Z_SOCKET_P(&elem);
socket_import_file_descriptor(fd, sock);
if (!socket_import_file_descriptor(fd, sock)) {
do_to_zval_err(ctx, "error getting protocol descriptor %d: getsockopt() call failed with errno %d", fd, errno);
zval_ptr_dtor(&elem);
return;
}
} else {
php_stream *stream = php_stream_fopen_from_fd(fd, "rw", NULL);
php_stream_to_zval(stream, &elem);