From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 12 Mar 2019 11:17:14 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f09db3073c670e7fc428076cbe7671c838830e2;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Switch to use ZTS cache
---

5f09db3073c670e7fc428076cbe7671c838830e2
diff --cc ext/ldap/config.m4
index 7a0103b4a7,8b94c06225..3fe0321702
--- a/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