]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Sat, 26 Nov 2016 23:36:57 +0000 (15:36 -0800)
committerStanislav Malyshev <stas@php.net>
Sat, 26 Nov 2016 23:36:57 +0000 (15:36 -0800)
* PHP-5.6:
  acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.
  Add more mbfl string size checks (bug #73505)

1  2 
acinclude.m4

diff --cc acinclude.m4
Simple merge