From: Stanislav Malyshev <stas@php.net>
Date: Mon, 4 Aug 2014 07:15:38 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa42a513a4cf51837ebc974014d52c0182562b8a;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #67705 (extensive backtracking in rule regular expression)
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)
---

fa42a513a4cf51837ebc974014d52c0182562b8a