From: Stanislav Malyshev <stas@php.net>
Date: Tue, 27 May 2014 01:05:59 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.14RC1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=076c25bfec126a431de574e4bad8df053ba50374;p=php

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

076c25bfec126a431de574e4bad8df053ba50374
diff --cc NEWS
index 73be964cce,3643227385..199bebd93d
--- a/NEWS
+++ b/NEWS
@@@ -40,24 -31,20 +40,27 @@@ PH
      not only the subset). (Anatol)
  
  - Fileinfo:
 -  . Fixed bug #67327 (fileinfo: CDF infinite loop in nelements DoS). 
 +  . Fixed bug #66307 (Fileinfo crashes with powerpoint files). (Anatol)
++  . Fixed bug #67327 (fileinfo: CDF infinite loop in nelements DoS).
+   . Fixed bug #67328 (fileinfo: fileinfo: numerous file_printf calls resulting in
+     performance degradation).
  
  - FPM:
 -  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor). 
 +  . Fixed bug #66908 (php-fpm reload leaks epoll_create() file descriptor).
      (Julio Pintos)
  
 -- Phar:
 -  . Fix bug #64498 ($phar->buildFromDirectory can't compress file with an accent 
 -    in its name). (PR #588) 
 +- GD:
 +  . Fixed bug #67248 (imageaffinematrixget missing check of parameters). (Stas)
  
 -01 May 2014, PHP 5.4.28
 +- PCRE:
 +  . Fixed bug #67238 (Ungreedy and min/max quantifier bug, applied patch
 +    from the upstream). (Anatol)
 +
 +- Phar:
 +  . Fix bug #64498 ($phar->buildFromDirectory can't compress file with an accent
 +    in its name). (PR #588)
  
 +30 Apr 2014, PHP 5.5.12
  - Core:
    . Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike)
    . Fixed bug #64330 (stream_socket_server() creates wrong Abstract Namespace