diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-10-29 23:43:59 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-10-29 23:43:59 +0800 |
| commit | af873d47881217914da6a379680ee0aa9c62c191 (patch) | |
| tree | ecb7f33f79e3e604f7cd59d27894c7fbb4298068 /ext/json/php_json_encoder.h | |
| parent | 66caa61188a7596f8af8da5d9f1217e5648f4076 (diff) | |
| parent | ef75ddd4f98e0155e698387ab7ef052a0174278a (diff) | |
| download | php-git-af873d47881217914da6a379680ee0aa9c62c191.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #73402 (Opcache segfault when using class constant to call a method)
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions