diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-02-15 00:09:30 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-02-15 00:09:30 -0800 |
| commit | e34a7a1b08342489e5ee1a83b00d98c4d9084c83 (patch) | |
| tree | dc2cf8bde2b185bdc4bf2329a1984a15bfd417eb /ext/json/php_json.h | |
| parent | cf0cf5b5074e0bd00c0e3eb948a7420363a41eed (diff) | |
| parent | c11b23c46577e30e1e0a7c0abfb4c7ea735c34e1 (diff) | |
| download | php-git-e34a7a1b08342489e5ee1a83b00d98c4d9084c83.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Conflicts:
ext/xsl/xsltprocessor.c
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions