diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-02 12:32:18 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-02 12:32:40 -0700 |
| commit | 63f42adbb2a3bb3e70e093490bd618159c9af5b3 (patch) | |
| tree | 697833dc439d283d4d4bde739d244b9347b638ce /ext/json/php_json.h | |
| parent | 834daa455bc9c8cde178c6978dcb548119b038e8 (diff) | |
| parent | af85eff5b6c77681e7e4f9440fa35dbe5c1529ae (diff) | |
| download | php-git-63f42adbb2a3bb3e70e093490bd618159c9af5b3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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