diff options
author | Anatol Belski <ab@php.net> | 2017-10-24 14:04:08 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-10-24 14:31:57 +0200 |
commit | 9d07af2a69a364009690d07f356e4dd6c81a7c8a (patch) | |
tree | 677a5917ea4bee13d5967fce2ca3fae68bcd17cf /ext/json/php_json_parser.h | |
parent | cb276ceedc4f7285c1d241d6c7f2c7c8ff763df7 (diff) | |
download | php-git-9d07af2a69a364009690d07f356e4dd6c81a7c8a.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #72535 arcfour encryption stream filter crashes php
(cherry picked from commit 968c8fc0d5f05f4abfc7caa4726cbfae6a5d0bf8)
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions