diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-05-26 18:11:38 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-05-26 18:11:38 -0700 |
| commit | 43faeaa621ba270a4a387f39bac8a523a0e7af6a (patch) | |
| tree | 6933b3d7c5d78ae95c1f402b4d1edf9e4f5e10ca /sapi/cli/php_cli_server.c | |
| parent | bdae3d254864501b97d651adb935a865a62418ba (diff) | |
| parent | 4c64bb27b1ac5f793c7e2eae721a8abee3c6f002 (diff) | |
| download | php-git-43faeaa621ba270a4a387f39bac8a523a0e7af6a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
update NEWS
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
fix my last commit with some locales
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions