]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 181f34f 8efd73c)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 16 Dec 2014 18:19:32 +0000 (10:19 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 16 Dec 2014 18:19:32 +0000 (10:19 -0800)
commit681a1afd3f76e97b243184e83ab826633e851cc3
tree105ea8fd8676d603d1d0fb44cb38e4ba55a09b1etree | snapshot
parent181f34f3757563381ce8eaf963e73cd64b38ec21commit | diff
parent8efd73c4d219e809167eda733bd74c3f2c0dc64ecommit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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.c diff1 | diff2 | blob | history
ext/standard/var_unserializer.re diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.