From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 12 Nov 2015 06:20:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.1RC1~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc611a134b8307879864e2e823254a67e5542014;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

fc611a134b8307879864e2e823254a67e5542014
diff --cc ext/ldap/ldap.c
index e0faf24b16,da8936cd76..f4dc087fac
--- a/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;
  	}