From: Stanislav Malyshev <stas@php.net>
Date: Tue, 27 May 2014 01:11:38 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43faeaa621ba270a4a387f39bac8a523a0e7af6a;p=php

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

43faeaa621ba270a4a387f39bac8a523a0e7af6a