]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 15 Jul 2013 15:35:29 +0000 (17:35 +0200)
committerAnatol Belski <ab@php.net>
Mon, 15 Jul 2013 15:35:29 +0000 (17:35 +0200)
* PHP-5.4:
  fix buffer overrun

1  2 
main/php_ini.c

diff --cc main/php_ini.c
Simple merge