diff options
author | Stanislav Malyshev <stas@php.net> | 2014-05-26 18:03:01 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-05-26 18:03:01 -0700 |
commit | 5ce11c2698ac944cb1e78ce50c2e7bfe3719303f (patch) | |
tree | 367d29a081c848078e67ac1dff2af606957ff3c3 /sapi/phpdbg/phpdbg.h | |
parent | 21f579b338dcfc6a06ff2a7f2fcf28a4fbf519d6 (diff) | |
parent | 4005f06df6a0f81f38f02a7afaf0760279a3cd6f (diff) | |
download | php-git-5ce11c2698ac944cb1e78ce50c2e7bfe3719303f.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* 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
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
0 files changed, 0 insertions, 0 deletions