diff options
| author | Tjerk Meesters <datibbaw@php.net> | 2014-10-12 12:55:24 +0800 |
|---|---|---|
| committer | Tjerk Meesters <datibbaw@php.net> | 2014-10-12 12:55:24 +0800 |
| commit | ea7604fc9e481318d9219bcc8b29125079965895 (patch) | |
| tree | 196d3cdad28f1758bfd06e92339b565de17368ff /ext/json/json.c | |
| parent | e33e4b2d8c44fb04afc54f688ed44dce7e8a2e0f (diff) | |
| parent | 37a685ff2bed7bda213c53604ad8cc6dc470751c (diff) | |
| download | php-git-ea7604fc9e481318d9219bcc8b29125079965895.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
More fixes for nodelist array access
- testing for null property read
- no zval copying if the type is already long
- memory fix for master
- use zend_long for offset
Conflicts:
ext/dom/php_dom.c
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions