]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorSara Golemon <pollita@php.net>
Mon, 30 Jan 2017 17:02:42 +0000 (09:02 -0800)
committerSara Golemon <pollita@php.net>
Mon, 30 Jan 2017 17:02:42 +0000 (09:02 -0800)
* PHP-7.0:
  Securely zero the hash context key

1  2 
ext/hash/hash.c

diff --cc ext/hash/hash.c
Simple merge