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: | Mon, 23 Nov 2015 02:08:02 +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-89962@lists.php.net to get a copy of this message | ||
Commit: a9bfdcb82ce6da10f9cf9592f9fd58990388335a
Author: Côme Bernigaud <mcmic@php.net> Mon, 23 Nov 2015 03:08:02 +0100
Parents: 205e0ba81d84bf91bdae13039a77db5fa1344dd4
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a9bfdcb82ce6da10f9cf9592f9fd58990388335a
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 8b66ba4..64885c7 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -349,9 +349,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 TSRMLS_CC, E_WARNING, "Too many open links (%ld)",
LDAPG(num_links));