Merge branch 'PHP-8.2' into PHP-8.3

2024-11-23 18:04:36 +08:00 · 2024-01-14 18:24:08 +00:00 · 2024-01-14 18:24:08 +00:00 · 719c74e919
commit 719c74e919
parent ed64949d12 5e2a586c9a
2 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -13,6 +13,10 @@ PHP                                                                        NEWS
 - Opcache:
  . Fixed bug GH-13145 (strtok() is not comptime). (ilutov)

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

--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@ -61,7 +61,7 @@
 #include <openssl/param_build.h>
 #endif

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