]> granicus.if.org Git - php/commit
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)
commit70e51db21026eaedc985278692651aeb0a454a86
tree59112112d22cfc1be04e78cee30891d159b58b4b
parent625ab10f990911fb474430ac7c83dfaea13346dd
parentc538a2eb120e3f0dd1e199456d5951dcf929f9f9
Merge branch 'PHP-5.6'

* 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
ext/enchant/enchant.c