diff options
author | Anatol Belski <ab@php.net> | 2014-05-27 12:24:23 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-05-27 12:24:23 +0200 |
commit | 4796204a4cef2a8d5378d142670592fd44eec403 (patch) | |
tree | 8acd354c648b38f42227fb12e845c4d86d10b144 /sapi/phpdbg/phpdbg.h | |
parent | 9c20452ee0d0d0dcf951081a0d7a53d56922637a (diff) | |
parent | eb2bd850041a84ac40d3b025419fb9a1b88b2280 (diff) | |
download | php-git-4796204a4cef2a8d5378d142670592fd44eec403.tar.gz |
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
Escape non-printable characters in the junit XML output
Fixed broken XML junit output due to escaping of CDATA sections
Fix #50444: PDO-ODBC changes for 64-bit
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
Update NEWs and add a test
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
0 files changed, 0 insertions, 0 deletions