diff options
author | Xinchen Hui <laruence@gmail.com> | 2015-11-12 14:20:03 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@gmail.com> | 2015-11-12 14:20:03 +0800 |
commit | fc611a134b8307879864e2e823254a67e5542014 (patch) | |
tree | 0c834cd48281213b3ac4d33810ecac0fc627473c | |
parent | e4e54f33ceb4ecce33397c867b45862af85c1fda (diff) | |
parent | 391087ed280f86f144ffa5a2b72eeeda3c271743 (diff) | |
download | php-git-fc611a134b8307879864e2e823254a67e5542014.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
-rw-r--r-- | ext/ldap/ldap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index e0faf24b16..f4dc087fac 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -345,6 +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, E_WARNING, "Too many open links (%pd)", LDAPG(num_links)); |