Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
  ext/ldap: Allow default host from ldap.conf to work.

Conflicts:
	ext/ldap/ldap.c

diff --cc ext/ldap/ldap.c
index 1a2168f979730c42ec291285f5183076688f4509,cec20da3ccaa477662b8667bef021291fb5bf6f4..0779387e5f88edc656159d12b9302a053e82cc79
--- 1/ext/ldap/ldap.c
--- 2/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@@ -425,7 -376,7 +425,7 @@@ PHP_FUNCTION(ldap_connect
                        }
  
                        url = emalloc(urllen);
-                       snprintf( url, urllen, "ldap://%s:" ZEND_LONG_FMT, host ? host : "", port );
 -                      snprintf( url, urllen, "ldap://%s:%ld", host, port );
++                      snprintf( url, urllen, "ldap://%s:" ZEND_LONG_FMT, host, port );
                }
  
  #ifdef LDAP_API_FEATURE_X_OPENLDAP