diff options
| author | Anatol Belski <ab@php.net> | 2016-04-08 12:32:27 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-04-08 12:32:27 +0200 |
| commit | de2da3bf02b63c2220b485a3aaa3cfdcb2871d70 (patch) | |
| tree | ac6dae2cf34d928e9c82a6b7eca586910c3489b7 /ext/json/php_json_parser.h | |
| parent | f63ba809a1961840407db08d0e5b59873b977366 (diff) | |
| parent | 1541a55a4f9207c346a805c2b8d090f16d07f841 (diff) | |
| download | php-git-de2da3bf02b63c2220b485a3aaa3cfdcb2871d70.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #68893 Stackoverflow in datefmt_create
Added missing newline.
Changed to check for error with the new function that returns null if error is set
Added function to check error and return null if error is set.
Added tests for bug 70451 and 70452
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions