Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)

Côme Bernigaud · Côme Bernigaud · commit 391087ed280f · 2015-11-12T07:06:05.000+01:00
Note that passing 0 will also result in default port.
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
@@ -349,6 +349,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));

Original file line number	Diff line number	Diff line change
`@@ -349,6 +349,9 @@ PHP_FUNCTION(ldap_connect)`
`349`	`349`	`RETURN_FALSE;`
`350`	`350`	`}`
`351`	`351`	`#endif`
	`352`	`+ if (!port) {`
	`353`	`+ port = LDAP_PORT;`
	`354`	`+ }`
`352`	`355`
`353`	`356`	`if (LDAPG(max_links) != -1 && LDAPG(num_links) >= LDAPG(max_links)) {`
`354`	`357`	`php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)", LDAPG(num_links));`