Skip to content

Commit b63a489

Browse files
committed
ext/openssl: Adjust ini files after bumping OpenSSL min version to 1.1.1
1 parent 03f9473 commit b63a489

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

php.ini-development

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -928,12 +928,6 @@ default_socket_timeout = 60
928928
; Be sure to appropriately set the extension_dir directive.
929929
;
930930
;extension=bz2
931-
932-
; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used
933-
; otherwise it results in segfault when unloading after using SASL.
934-
; See https://github.com/php/php-src/issues/8620 for more info.
935-
;extension=ldap
936-
937931
;extension=curl
938932
;extension=ffi
939933
;extension=ftp
@@ -942,6 +936,7 @@ default_socket_timeout = 60
942936
;extension=gettext
943937
;extension=gmp
944938
;extension=intl
939+
;extension=ldap
945940
;extension=mbstring
946941
;extension=exif ; Must be after mbstring as it depends on it
947942
;extension=mysqli

php.ini-production

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -930,12 +930,6 @@ default_socket_timeout = 60
930930
; Be sure to appropriately set the extension_dir directive.
931931
;
932932
;extension=bz2
933-
934-
; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used
935-
; otherwise it results in segfault when unloading after using SASL.
936-
; See https://github.com/php/php-src/issues/8620 for more info.
937-
;extension=ldap
938-
939933
;extension=curl
940934
;extension=ffi
941935
;extension=ftp
@@ -944,6 +938,7 @@ default_socket_timeout = 60
944938
;extension=gettext
945939
;extension=gmp
946940
;extension=intl
941+
;extension=ldap
947942
;extension=mbstring
948943
;extension=exif ; Must be after mbstring as it depends on it
949944
;extension=mysqli

0 commit comments

Comments
 (0)