archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Fix GH-7978: sockets extension compilation errors
This commit is contained in:
Christoph M. Becker 2022-01-21 23:58:21 +01:00
commit 943d6f642a
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -26,6 +26,9 @@ PHP NEWS
- pcntl: - pcntl:
. Fixed pcntl_rfork build for DragonFlyBSD. (David Carlier) . Fixed pcntl_rfork build for DragonFlyBSD. (David Carlier)
- Sockets:
. Fixed bug GH-7978 (sockets extension compilation errors). (David Carlier)
- Standard: - Standard:
. Fixed bug GH-7899 (Regression in unpack for negative int value). (Remi) . Fixed bug GH-7899 (Regression in unpack for negative int value). (Remi)
. Fixed bug GH-7875 (mails are sent even if failure to log throws exception). . Fixed bug GH-7875 (mails are sent even if failure to log throws exception).

3
ext/sockets/config.m4
View file

@ -67,6 +67,9 @@ if test "$PHP_SOCKETS" != "no"; then
AC_CACHE_CHECK([if ancillary credentials uses ucred],[ac_cv_ucred], AC_CACHE_CHECK([if ancillary credentials uses ucred],[ac_cv_ucred],
[ [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#include <sys/socket.h> #include <sys/socket.h>
]], [[struct ucred u = {.gid = 0};]])], ]], [[struct ucred u = {.gid = 0};]])],
[ac_cv_ucred=yes], [ac_cv_ucred=no]) [ac_cv_ucred=yes], [ac_cv_ucred=no])