From: Côme Bernigaud <mcmic@php.net>
Date: Mon, 23 Nov 2015 02:15:46 +0000 (+0100)
Subject: Merge branch 'php-7.0'
X-Git-Tag: php-7.1.0alpha1~705^2~55^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56b584491bb4644f731427452ff6401ca06a55cf;p=php

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

56b584491bb4644f731427452ff6401ca06a55cf
diff --cc ext/ldap/ldap.c
index 9eaad2d878,ab663b156b..e0faf24b16
--- a/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;
  	}