Skip to content

Commit 3871ab2

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents 642fcdb + 9416186 commit 3871ab2

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

php.ini-development

+6-1
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,12 @@ default_socket_timeout = 60
913913
; Be sure to appropriately set the extension_dir directive.
914914
;
915915
;extension=bz2
916+
917+
; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used
918+
; otherwise it results in segfault when unloading after using SASL.
919+
; See https://github.com/php/php-src/issues/8620 for more info.
920+
;extension=ldap
921+
916922
;extension=curl
917923
;extension=ffi
918924
;extension=ftp
@@ -922,7 +928,6 @@ default_socket_timeout = 60
922928
;extension=gmp
923929
;extension=intl
924930
;extension=imap
925-
;extension=ldap
926931
;extension=mbstring
927932
;extension=exif ; Must be after mbstring as it depends on it
928933
;extension=mysqli

php.ini-production

+6-1
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,12 @@ default_socket_timeout = 60
915915
; Be sure to appropriately set the extension_dir directive.
916916
;
917917
;extension=bz2
918+
919+
; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used
920+
; otherwise it results in segfault when unloading after using SASL.
921+
; See https://github.com/php/php-src/issues/8620 for more info.
922+
;extension=ldap
923+
918924
;extension=curl
919925
;extension=ffi
920926
;extension=ftp
@@ -924,7 +930,6 @@ default_socket_timeout = 60
924930
;extension=gmp
925931
;extension=intl
926932
;extension=imap
927-
;extension=ldap
928933
;extension=mbstring
929934
;extension=exif ; Must be after mbstring as it depends on it
930935
;extension=mysqli

0 commit comments

Comments
 (0)