com php-src: Revert "Using default port in ldap_connect whe n NULL is passed (this was the behavior prior to 5.6.11)": ext/ldap/ldap.c
| From: | Côme Bernigaud | Date: | Tue, 24 Nov 2015 02:45:17 +0000 |
| Subject: | com php-src: Revert "Using default port in ldap_connect whe n NULL is passed (this was the behavior prior to 5.6.11)": ext/ldap/ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89984@lists.php.net to get a copy of this message | ||
Commit: 5a8bcf73ba5aa381a5440c22780504e5d809b995
Author: Côme Bernigaud <mcmic@php.net> Mon, 23 Nov 2015 03:08:02 +0100
Parents: a8bd182ccd18aaf8919b6693281ecf8bbf4714e8
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5a8bcf73ba5aa381a5440c22780504e5d809b995
Log:
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to
5.6.11)"
This reverts commit 391087ed280f86f144ffa5a2b72eeeda3c271743.
Changed paths:
M ext/ldap/ldap.c
Diff:
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 9eaad2d..4ff6534 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -345,9 +345,6 @@ 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, E_WARNING, "Too many open links (%pd)", LDAPG(num_links));