]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 16 Dec 2014 18:17:07 +0000 (10:17 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 16 Dec 2014 18:17:07 +0000 (10:17 -0800)
* PHP-5.4:
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()


Trivial merge