]> granicus.if.org Git - php/commit
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)
commit622a3463024c2ef121e31cbdcb53cf101399d5b3
tree9278503a62f62d4d8edbd089bfc5e976116502ae
parent9c4de388c6adfa7207611e320343622ce8fde0f8
parent53f129a44d3c4ec0fae57993b9ae2f6cb48973cc
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()