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)"

diff --cc ext/ldap/ldap.c
index 9eaad2d8782a025dc388f54e5c0eee22c9f3fbac,ab663b156be320c3bba8a7267187105adc47361a..e0faf24b160cab2d4c69c94ce23dd5e7b7e437ac
--- 1/ext/ldap/ldap.c
--- 2/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;
        }