]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 25 Mar 2014 10:01:20 +0000 (11:01 +0100)
committerRemi Collet <remi@php.net>
Tue, 25 Mar 2014 10:01:20 +0000 (11:01 +0100)
commit84b0ab6d8f82fbb20725044ff910f98aaed698a3
treec68a8608e2d6ab72a100bc2f5b6877e811d68aba
parent7477f5b387c2a492cc29ddd30a0d3d0b0a6a9952
parent3616db6d381ff41fcf7f775d8fd7ff65b2bc83db
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