]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 625ab10 c538a2e)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 17 Feb 2015 06:10:30 +0000 (07:10 +0100)
committerStanislav Malyshev <stas@php.net>
Tue, 17 Feb 2015 06:10:30 +0000 (07:10 +0100)
* PHP-5.6:
  update news
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN

Conflicts:
ext/date/php_date.c

1  2 
ext/enchant/enchant.c patch | diff1 | diff2 | blob | history

diff --cc ext/enchant/enchant.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.