]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/1946' into PHP-7.1.0
authorCôme Bernigaud <mcmic@php.net>
Thu, 23 Jun 2016 05:22:40 +0000 (07:22 +0200)
committerCôme Bernigaud <mcmic@php.net>
Thu, 23 Jun 2016 05:22:40 +0000 (07:22 +0200)
* pull-request/1946:
  Add additional LDAP SASL constants
  Add tests for LDAP_OPT_* constants
  Add LDAP TLS Protocol Min constants
  Add tests for the LDAP CRL check option
  Add missing LDAP constants

1  2 
ext/ldap/ldap.c

diff --cc ext/ldap/ldap.c
Simple merge