Merge branch 'PHP-7.4'

* PHP-7.4:
  Switch to use ZTS cache

diff --cc ext/ldap/config.m4
index 7a0103b4a78ea995bcb053595f0f32f0e77fe073,8b94c06225ff5e97dadd3c23ed2484facded7398..3fe0321702fd57b01fbf8bea5a06fbe1eb3c372a
--- 1/ext/ldap/config.m4
--- 2/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@@ -96,7 -96,7 +96,7 @@@ PHP_ARG_WITH([ldap-sasl]
  
  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 -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
++  PHP_NEW_EXTENSION(ldap, ldap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
  
    if test "$PHP_LDAP" = "yes"; then
      for i in /usr/local /usr; do

diff --cc ext/ldap/config.w32
Simple merge

diff --cc ext/ldap/ldap.c
Simple merge