From 024d5f3e2cc8bc3723911354f8631cddf1cd8120 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 29 Mar 2023 11:41:04 +0100 Subject: [PATCH] Bump minimum OpenSSL version to 1.1.1 --- build/php.m4 | 2 +- ext/openssl/config0.m4 | 2 +- php.ini-development | 4 ---- php.ini-production | 4 ---- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index e11a00c3bcb1..569b90ceb162 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -1942,7 +1942,7 @@ dnl AC_DEFUN([PHP_SETUP_OPENSSL],[ found_openssl=no - PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.2], [found_openssl=yes]) + PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.1.1], [found_openssl=yes]) if test "$found_openssl" = "yes"; then PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1) diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4 index ffd4e0751cc6..f449a19d55cd 100644 --- a/ext/openssl/config0.m4 +++ b/ext/openssl/config0.m4 @@ -1,7 +1,7 @@ PHP_ARG_WITH([openssl], [for OpenSSL support], [AS_HELP_STRING([--with-openssl], - [Include OpenSSL support (requires OpenSSL >= 1.0.2)])]) + [Include OpenSSL support (requires OpenSSL >= 1.1.1)])]) PHP_ARG_WITH([kerberos], [for Kerberos support], diff --git a/php.ini-development b/php.ini-development index d6bc11ae17e4..2c975fd3acf2 100644 --- a/php.ini-development +++ b/php.ini-development @@ -929,11 +929,7 @@ default_socket_timeout = 60 ; ;extension=bz2 -; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used -; otherwise it results in segfault when unloading after using SASL. -; See https://github.com/php/php-src/issues/8620 for more info. ;extension=ldap - ;extension=curl ;extension=ffi ;extension=ftp diff --git a/php.ini-production b/php.ini-production index 0d6ca0f14448..531286d7f4b7 100644 --- a/php.ini-production +++ b/php.ini-production @@ -931,11 +931,7 @@ default_socket_timeout = 60 ; ;extension=bz2 -; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used -; otherwise it results in segfault when unloading after using SASL. -; See https://github.com/php/php-src/issues/8620 for more info. ;extension=ldap - ;extension=curl ;extension=ffi ;extension=ftp