diff options
| author | Anatol Belski <ab@php.net> | 2017-10-24 13:38:48 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-10-24 14:30:37 +0200 |
| commit | cb276ceedc4f7285c1d241d6c7f2c7c8ff763df7 (patch) | |
| tree | 519595d0ace539b8b2226a2bcea19e24098467a7 /ext/json/php_json_parser.h | |
| parent | 1186b81514d58a7849862dfcb688ea86719331b5 (diff) | |
| download | php-git-cb276ceedc4f7285c1d241d6c7f2c7c8ff763df7.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
Apply upstream patch for CVE-2016-1283
(cherry picked from commit 5efbcd1882abaf6ef64cc5ee5266040353ba25b2)
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions