diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-05-26 18:06:58 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-05-26 18:06:58 -0700 |
| commit | bc87ba8ee64c411c9d1943addf1688a73677c740 (patch) | |
| tree | 1c21e5f02cb550d2009cb52fbca92b7b9c741496 /sapi/cli/php_cli_server.c | |
| parent | f105e1589df4f6e072a4596762639cd8b032ec5c (diff) | |
| parent | 076c25bfec126a431de574e4bad8df053ba50374 (diff) | |
| download | php-git-bc87ba8ee64c411c9d1943addf1688a73677c740.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backport this piece from 5.6, related to the #66307 fix
Fixed bug #66307 Fileinfo crashes with powerpoint files
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
fix my last commit with some locales
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions