]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 17 Feb 2015 05:53:48 +0000 (06:53 +0100)
committerStanislav Malyshev <stas@php.net>
Tue, 17 Feb 2015 05:53:48 +0000 (06:53 +0100)
commitcf7d8eabcc998bf4b60d4607de4942081dd2b895
tree40e8d5408a21f5e06c6a60275bcf176e32b734fa
parent29a4e710de6a73341da3d268343fdfc072ba682a
parentbdfe457a2c1b47209e32783b3a6447e81baf179a
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
ext/enchant/enchant.c