summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorDaniel Lowrey <rdlowrey@php.net>2014-01-27 15:00:04 -0700
committerDaniel Lowrey <rdlowrey@php.net>2014-01-27 15:00:04 -0700
commitaafce7353eb90d6728205abc950a0197740d0cfa (patch)
tree52b1e37ed53fd4cf4adee47cbbd2a56817887fc8 /ext/json/json.c
parent9f3a98b124d73eabc8a71d62c9e12f965dadfc65 (diff)
parentfc36908c88d096ee167c6afa7813c8f865a0a7e9 (diff)
downloadphp-git-aafce7353eb90d6728205abc950a0197740d0cfa.tar.gz
Merge branch '5.6'
* 5.6: Update NEWS/UPGRADING Prevent invalid SAN peer verification on null byte prefix attack
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions