Merge branch 'PHP-5.6' into PHP-7.0

This commit is contained in:
Xinchen Hui 2015-11-12 14:20:03 +08:00
commit fc611a134b

View File

@ -345,6 +345,9 @@ PHP_FUNCTION(ldap_connect)
RETURN_FALSE; RETURN_FALSE;
} }
#endif #endif
if (!port) {
port = LDAP_PORT;
}
if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) { if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) {
php_error_docref(NULL, E_WARNING, "Too many open links (%pd)", LDAPG(num_links)); php_error_docref(NULL, E_WARNING, "Too many open links (%pd)", LDAPG(num_links));