diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-28 12:28:30 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-28 12:28:30 -0700 |
| commit | 3fd8a76f268984bf9dc39e4ed57983f92da1776b (patch) | |
| tree | 458fadcbb1a66aee849121e0a7d515f4d4c14a56 /ext/intl/php_intl.c | |
| parent | e14b7f629b036f11d875d21b8cb27b079323ce27 (diff) | |
| parent | a8e84b1b21c80ec1060f5afeb146b13ddf267d3e (diff) | |
| download | php-git-3fd8a76f268984bf9dc39e4ed57983f92da1776b.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Set an LDAP error code when failing ldap_bind due to null bytes
Conflicts:
ext/ldap/ldap.c
Diffstat (limited to 'ext/intl/php_intl.c')
0 files changed, 0 insertions, 0 deletions