Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
This commit is contained in:
Stanislav Malyshev 2014-05-26 18:05:59 -07:00
commit 076c25bfec

3
NEWS
View File

@ -41,6 +41,9 @@ PHP NEWS
- Fileinfo:
. Fixed bug #66307 (Fileinfo crashes with powerpoint files). (Anatol)
. Fixed bug #67327 (fileinfo: CDF infinite loop in nelements DoS).
. Fixed bug #67328 (fileinfo: fileinfo: numerous file_printf calls resulting in
performance degradation).
- FPM:
. Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).