]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 28 Sep 2014 19:25:49 +0000 (12:25 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 28 Sep 2014 19:25:49 +0000 (12:25 -0700)
* PHP-5.5:
  Set an LDAP error code when failing ldap_bind due to null bytes

1  2 
ext/ldap/ldap.c

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