]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Fri, 7 Nov 2014 06:48:26 +0000 (09:48 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 7 Nov 2014 06:48:26 +0000 (09:48 +0300)
commited4c0245c7ca51490ea10e2756076285560a5d88
treeb98f1d7138f19783861c6b103d88f91d65774637
parent8fdc4d8797e176f9bb8d9f9509a45346478d9cc1
parent9dfa843a386b65b18353c510f032e322004d0bb7
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)