]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 2 Sep 2014 19:33:02 +0000 (12:33 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Sep 2014 19:33:02 +0000 (12:33 -0700)
* PHP-5.6:
  Fix bug #67644 - Memory corruption & crash during ob_start function callback

1  2 
main/main.c

diff --cc main/main.c
Simple merge