summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-11-07 09:57:27 +0300
committerDmitry Stogov <dmitry@zend.com>2014-11-07 09:57:27 +0300
commit6b4b972565e38c41f1ce43c3a475e41e186b0f0c (patch)
tree5ece15c6250d457bc12b092c68dda9d882a3b1c4 /ext/json/php_json_encoder.h
parent45719aee26f250e59c7d917a8f913c2fce48b146 (diff)
parente120438c8c06b03308fa1f585623059a093a3604 (diff)
downloadphp-git-6b4b972565e38c41f1ce43c3a475e41e186b0f0c.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: 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) Fixed bug #68351 (PDO::PARAM_BOOL and ATTR_EMULATE_PREPARES misbehaving) Update NEWS
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions