Merge branch 'PHP-5.6' into PHP-7.0

diff --cc ext/ldap/ldap.c
index e0faf24b160cab2d4c69c94ce23dd5e7b7e437ac,da8936cd763cc891b77134e6ae97d771e7c42e55..f4dc087fac4f316c5b4d8a1a577d21cec483924b
--- 1/ext/ldap/ldap.c
--- 2/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@@ -345,9 -349,12 +345,12 @@@ 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;
        }