diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-02 12:31:29 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-02 12:32:03 -0700 |
| commit | af85eff5b6c77681e7e4f9440fa35dbe5c1529ae (patch) | |
| tree | 90ede2c8bc7189f94d25bf9a02ee884659faec11 /ext/json/php_json.h | |
| parent | 4b9fcc01d4cd17d3933c8f9c76fb37359117ce2e (diff) | |
| parent | 53fa6c5b6b5b09059ba54c8912d0c0aef57aa4ff (diff) | |
| download | php-git-af85eff5b6c77681e7e4f9440fa35dbe5c1529ae.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67644 - Memory corruption & crash during ob_start function callback
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions