]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: acffb7a 274d841)
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)
* '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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.