From: Remi Collet <remi@php.net>
Date: Tue, 25 Mar 2014 10:01:20 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0beta1~3^2~44^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84b0ab6d8f82fbb20725044ff910f98aaed698a3;p=php

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
---

84b0ab6d8f82fbb20725044ff910f98aaed698a3