From: Stanislav Malyshev <stas@php.net>
Date: Tue, 27 May 2014 01:06:58 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta4~1^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc87ba8ee64c411c9d1943addf1688a73677c740;p=php

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
---

bc87ba8ee64c411c9d1943addf1688a73677c740