]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 2 Sep 2014 21:19:16 +0000 (14:19 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 2 Sep 2014 21:19:16 +0000 (14:19 -0700)
commit91505203c06f9ee981287ca7ae11b0763eb966aa
tree5d649f374485fef6ee9b350b8e27f8245f184202
parentce776aea5736fb190bf6cea86c16de56cedf1e6d
parent0c6e2b52197bc2e3834b39eff2dcd4b977bd4b65
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "Fix bug #67644 - Memory corruption & crash during ob_start function callback"
main/main.c