From: Côme Bernigaud <mcmic@php.net>
Date: Tue, 30 May 2017 14:48:16 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~36^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bb295e659303d2327b2bc0d5cac44825ac2f066;p=php

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

1bb295e659303d2327b2bc0d5cac44825ac2f066
diff --cc ext/ldap/ldap.c
index 1a2168f979,cec20da3cc..0779387e5f
--- a/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