]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 16 Dec 2014 18:25:03 +0000 (10:25 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 16 Dec 2014 18:25:03 +0000 (10:25 -0800)
commit9152214c1e20723f73b5f7b6c77b1183327bcf69
tree02ad4cdec8d9631fc08b6014547c4ee82c167b48
parent3a18597774d4b63a134db0c38235be9fa72f9560
parent681a1afd3f76e97b243184e83ab826633e851cc3
Merge branch 'PHP-5.6'

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

Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re