diff options
author | Stanislav Malyshev <stas@php.net> | 2016-11-26 15:36:57 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2016-11-26 15:36:57 -0800 |
commit | 343c0567729f57fc880600c65499a6bbf43277e6 (patch) | |
tree | cdeff2852afee5bc69e7ac967fff8e859ddf5753 /sapi/phpdbg/phpdbg_prompt.c | |
parent | 58cdd03d9267db3ee62a084492af3cdd12b86cdc (diff) | |
parent | 114277ed453f6a75771032f760fd2de64544a08d (diff) | |
download | php-git-343c0567729f57fc880600c65499a6bbf43277e6.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.
Add more mbfl string size checks (bug #73505)
Diffstat (limited to 'sapi/phpdbg/phpdbg_prompt.c')
0 files changed, 0 insertions, 0 deletions