]> granicus.if.org Git - php/commit
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 5 Jul 2017 16:16:26 +0000 (19:16 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 5 Jul 2017 16:16:26 +0000 (19:16 +0300)
commit73d5097a9f11fa1dd4b81fe026d7407e55645bb6
tree23d4c6bd212f5c26a5f1281388f47d9b5d9f6757
parentacffb7a080eec216ec41212921d8d436ed121863
parent274d84139b33ef47b40db0ad206270c578c26f93
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