]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8fccf0b ed4c024)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Fri, 7 Nov 2014 06:54:05 +0000 (09:54 +0300)
committerDmitry Stogov <dmitry@zend.com>
Fri, 7 Nov 2014 06:54:05 +0000 (09:54 +0300)
commite120438c8c06b03308fa1f585623059a093a3604
tree642966eeb6fd1a86cb557159ec98f508ab48cc8ctree | snapshot
parent8fccf0bac9eab67412612b2df14da58b9129c6b2commit | diff
parented4c0245c7ca51490ea10e2756076285560a5d88commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Partial fix for bug #68365 (zend_mm_heap corrupted after memory overflow in zend_hash_copy)
  Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving)
Zend/zend_variables.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.