diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-11-07 09:54:05 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-11-07 09:54:05 +0300 |
| commit | e120438c8c06b03308fa1f585623059a093a3604 (patch) | |
| tree | 642966eeb6fd1a86cb557159ec98f508ab48cc8c /ext/json/php_json.h | |
| parent | 8fccf0bac9eab67412612b2df14da58b9129c6b2 (diff) | |
| parent | ed4c0245c7ca51490ea10e2756076285560a5d88 (diff) | |
| download | php-git-e120438c8c06b03308fa1f585623059a093a3604.tar.gz | |
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)
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions