From: Côme Bernigaud <mcmic@php.net>
Date: Mon, 6 Jul 2015 12:56:20 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta1~12^2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da6e286dbbdc067c5583cd9a29bafc6457d640cc;p=php

Merge branch 'PHP-5.6'

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

da6e286dbbdc067c5583cd9a29bafc6457d640cc