com php-src: Merge branch 'PHP-7.4': ext/ldap/config.m4 ext/ldap/config.w32 ext/ldap/ldap.c
| From: | Dmitry Stogov | Date: | Tue, 12 Mar 2019 11:17:14 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': ext/ldap/config.m4 ext/ldap/config.w32 ext/ldap/ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105103@lists.php.net to get a copy of this message | ||
Commit: 5f09db3073c670e7fc428076cbe7671c838830e2
Author: Dmitry Stogov <dmitry@zend.com> Tue, 12 Mar 2019 14:17:14 +0300
Parents: c56bd7e220dacd1bf65c08d6e1c4ab406b160993 f1b306fe117cfbbe69ab4ef9713d39ea068e74c0
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=5f09db3073c670e7fc428076cbe7671c838830e2
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
Switch to use ZTS cache
Changed paths:
MM ext/ldap/config.m4
MM ext/ldap/config.w32
MM ext/ldap/ldap.c
Diff:
diff --cc ext/ldap/config.m4
index 7a0103b,8b94c06..3fe0321
--- 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