From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 5 Jul 2017 16:16:26 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.2.0beta1~141
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73d5097a9f11fa1dd4b81fe026d7407e55645bb6;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Added constants for known ldap controls OID and tests for ldap_get/set_option for controls
  Added support for controls to ldap_get_option
---

73d5097a9f11fa1dd4b81fe026d7407e55645bb6