Merge branch 'PHP-5.6'

* PHP-5.6:
  Attempt at falling back on ldap_find_control for Mac OS

ext/ldap/config.m4

@@ -204,7 +204,7 @@ if test "$PHP_LDAP" != "no"; then
 
   dnl Solaris 2.8 claims to be 2004 API, but doesn't have
   dnl ldap_parse_reference() nor ldap_start_tls_s()
-  AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s])
+  AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s ldap_control_find])
 
   dnl
   dnl SASL check

ext/ldap/ldap.c

@@ -70,6 +70,14 @@
 #define PHP_LDAP_ESCAPE_FILTER 0x01
 #define PHP_LDAP_ESCAPE_DN     0x02
 
+#ifndef HAVE_LDAP_CONTROL_FIND
+LDAPControl *ldap_control_find( const char *oid, LDAPControl **ctrls, LDAPControl ***nextctrlp)
+{
+  assert(nextctrlp == NULL);
+  return ldap_find_control(oid, ctrls);
+}
+#endif
+
 typedef struct {
 	LDAP *link;
 #if defined(HAVE_3ARG_SETREBINDPROC)