diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 12:37:34 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 12:37:34 +0300 |
| commit | 7c2956d15c7b5e8ce10efb1bb80470ff8a8dc9fd (patch) | |
| tree | 406132fa45b5d7753e4e78e36d902d7ca9ebad1c /ext/mysqlnd/mysqlnd_block_alloc.c | |
| parent | 0d240c3c5607f8be206f310b2c59b3f92bd5362c (diff) | |
| parent | baf5fdf59863b75917cee1d65d632e9dc8c6d6a6 (diff) | |
| download | php-git-7c2956d15c7b5e8ce10efb1bb80470ff8a8dc9fd.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.
Conflicts:
NEWS
Zend/zend_gc.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd_block_alloc.c')
0 files changed, 0 insertions, 0 deletions