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-7.4' into PHP-8.0

Browse source 
* PHP-7.4:
  Fix #75725: ./configure: detecting RAND_egd
This commit is contained in:
Christoph M. Becker 2021-11-22 14:13:08 +01:00
commit b29e85a0da
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -19,6 +19,9 @@ PHP NEWS
- GD:
. Fixed bug #71316 (libpng warning from imagecreatefromstring). (cmb)
- OpenSSL:
. Fixed bug #75725 (./configure: detecting RAND_egd). (Dilyan Palauzov)
- SPL:
. Fixed bug #81587 (MultipleIterator Segmentation fault w/ SimpleXMLElement
attached). (Nikita)

3
ext/openssl/config0.m4
View file

@ -28,8 +28,6 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_EVAL_LIBLINE($KERBEROS_LIBS, OPENSSL_SHARED_LIBADD)
fi
AC_CHECK_FUNCS([RAND_egd])
PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD,
[
AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
@ -39,4 +37,5 @@ if test "$PHP_OPENSSL" != "no"; then
if test "$PHP_SYSTEM_CIPHERS" != "no"; then
AC_DEFINE(USE_OPENSSL_SYSTEM_CIPHERS,1,[ Use system default cipher list instead of hardcoded value ])
fi
AC_CHECK_FUNCS([RAND_egd])
fi