]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f105e15 076c25b)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 27 May 2014 01:06:58 +0000 (18:06 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 27 May 2014 01:06:58 +0000 (18:06 -0700)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.