]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7477f5b 3616db6)
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)
* 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


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