com php-src: Merge branch 'PHP-5.6': ext/ldap/ldap.c

Commit: 6cf6f2c6bf0b386c7bcaea0479f2f676d3ef8069 Author: Dmitry Stogov <dmitry@zend.com> Mon, 29 Jun 2015 18:14:14 +0300 Parents: dc588997e202b5a645052bfb21098cc571693569 ee1e67fae6f649894721a5293ad9ab290add121f Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=6cf6f2c6bf0b386c7bcaea0479f2f676d3ef8069 Log: Merge branch 'PHP-5.6' * PHP-5.6: On Windows PHP may be restarted with different set of DSO extensions without SHM reset. This may make optimisation for entities from DSO extensions inconsistent. Putting back deprecated symbols for ldap_sort Removed deprecated function calls from ldap module Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning Changed paths: MM ext/ldap/ldap.c Diff: diff --cc ext/ldap/ldap.c index a7e7522,e2bcd17..401842e --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@@ -1958,19 -1913,15 +1958,19 @@@ PHP_FUNCTION(ldap_compare { zval *link; char *dn, *attr, *value; - int dn_len, attr_len, value_len; + size_t dn_len, attr_len, value_len; ldap_linkdata *ld; int errno; ++ struct berval lvalue; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsss", &link, &dn, &dn_len, &attr, &attr_len, &value, &value_len) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsss", &link, &dn, &dn_len, &attr, &attr_len, &value, &value_len) != SUCCESS) { return; } - struct berval lvalue; + if ((ld = (ldap_linkdata *)zend_fetch_resource(Z_RES_P(link), "ldap link", le_link)) == NULL) { + RETURN_FALSE; + } + - struct berval lvalue; lvalue.bv_val = value; lvalue.bv_len = value_len;