Skip to content

Commit 719c74e

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
2 parents ed64949 + 5e2a586 commit 719c74e

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ PHP NEWS
1313
- Opcache:
1414
. Fixed bug GH-13145 (strtok() is not comptime). (ilutov)
1515

16+
- OpenSSL:
17+
. Fixed LibreSSL undefined reference when OPENSSL_NO_ENGINE not set.
18+
(David Carlier).
19+
1620
- Phar:
1721
. Fixed bug #71465 (PHAR doesn't know about litespeed). (nielsdos)
1822

ext/openssl/openssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#include <openssl/param_build.h>
6262
#endif
6363

64-
#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(OPENSSL_NO_ENGINE)
64+
#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) && !defined(OPENSSL_NO_ENGINE)
6565
#include <openssl/engine.h>
6666
#endif
6767

0 commit comments

Comments
 (0)