fix my last commit with some locales
fix my last commit with some locales
Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS

Upstream fix: https://github.com/file/file/commit/f97486ef5dc3e8735440edc4fc8808c63e1a3ef0
Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)

Upstream patch: https://github.com/file/file/commit/b8acc83781d5a24cc5101e525d15efe0482c280d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
Fixed bug #66307 Fileinfo crashes with powerpoint files
backport this piece from 5.6, related to the #66307 fix
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
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
update NEWS
Fix #50444: PDO-ODBC changes for 64-bit

This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #50444: PDO-ODBC changes for 64-bit
Fixed broken XML junit output due to escaping of CDATA sections

I've removed CDATA and used htmlspecialchars as the output might not be UTF-8 safe, as pointed out by ircmaxell in 26b37f1792dfaf9b0b30f81e492c8f68b9ece571
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed broken XML junit output due to escaping of CDATA sections
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed broken XML junit output due to escaping of CDATA sections
Escape non-printable characters in the junit XML output

XML doesn't allow most of the characters < 0x20 and binary output
breaks XML parsers. Such characters are not allowed as entities
either, so the generated entities are escaped in order to be printed
as text.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Escape non-printable characters in the junit XML output
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Escape non-printable characters in the junit XML output
5.5.13 release date
Fix bug #67249: printf out-of-bounds read