diff options
author | Remi Collet <remi@php.net> | 2014-03-25 11:01:20 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2014-03-25 11:01:20 +0100 |
commit | 84b0ab6d8f82fbb20725044ff910f98aaed698a3 (patch) | |
tree | c68a8608e2d6ab72a100bc2f5b6877e811d68aba /sapi/phpdbg/phpdbg_help.c | |
parent | 7477f5b387c2a492cc29ddd30a0d3d0b0a6a9952 (diff) | |
parent | 3616db6d381ff41fcf7f775d8fd7ff65b2bc83db (diff) | |
download | php-git-84b0ab6d8f82fbb20725044ff910f98aaed698a3.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions