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


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