diff options
author | Anatol Belski <ab@php.net> | 2014-05-27 12:25:31 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-05-27 12:25:31 +0200 |
commit | fa59cc202ffb79e608255865906c85130f9cf9b6 (patch) | |
tree | 0f1a07e848b51fc9c151256de7515489c6bd0648 /sapi/phpdbg/phpdbg_help.c | |
parent | 567f5e5247e1606f0c5b30f523a122d292a454bb (diff) | |
parent | 4796204a4cef2a8d5378d142670592fd44eec403 (diff) | |
download | php-git-fa59cc202ffb79e608255865906c85130f9cf9b6.tar.gz |
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
fix zpp
fix zpp
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_help.c')
0 files changed, 0 insertions, 0 deletions