summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--ext/ldap/config.m42
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d0499ad06a..f3f68b00e8 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ PHP NEWS
files). (Ilia)
- Fixed bug #38934 (move_uploaded_file() cannot read uploaded file outside of
open_basedir). (Ilia)
+- Fixed bug #38882 (ldap_connect causes segfault with newer versions of
+ OpenLDAP). (Tony)
- Fixed bug #38649 (uninit'd optional arg in stream_socket_sendto()). (Sara)
- Fixed bug #38465 (ReflectionParameter fails if default value is an access to
self::). (Johannes)
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 401829fcf4..5f710b8233 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -70,7 +70,7 @@ PHP_ARG_WITH(ldap-sasl,for LDAP Cyrus SASL support,
if test "$PHP_LDAP" != "no"; then
- PHP_NEW_EXTENSION(ldap, ldap.c, $ext_shared)
+ PHP_NEW_EXTENSION(ldap, ldap.c, $ext_shared,,-DLDAP_DEPRECATED=1)
if test "$PHP_LDAP" = "yes"; then
for i in /usr/local /usr; do