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

From: Date: Mon, 23 Nov 2015 02:15:46 +0000
Subject: com php-src: Merge branch 'php-7.0': ext/ldap/ldap.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89960@lists.php.net to get a copy of this message
Commit: 56b584491bb4644f731427452ff6401ca06a55cf Author: Côme Bernigaud <mcmic@php.net> Mon, 23 Nov 2015 03:15:46 +0100 Parents: 58168b48e28e56862c09325dc2607eaa5dc8b828 ab39f981f822d7f2f41612496c55b4e8b6213be9 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56b584491bb4644f731427452ff6401ca06a55cf Log: Merge branch 'php-7.0' * php-7.0: Revert "Added back support for undocummented host:port syntax" Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)" Changed paths: MM ext/ldap/ldap.c Diff: diff --cc ext/ldap/ldap.c index 9eaad2d,ab663b1..e0faf24 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@@ -345,12 -349,9 +345,9 @@@ PHP_FUNCTION(ldap_connect RETURN_FALSE; } #endif - if (!port) { - port = LDAP_PORT; - } if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", LDAPG(num_links)); + php_error_docref(NULL, E_WARNING, "Too many open links (%pd)", LDAPG(num_links)); RETURN_FALSE; }

« previous php.cvs (#89960) next »